Merge "Some visual fixes for when header is in footer position + proper radius"