Last minute layout alignment tweaks