Misc layout updates