layout updates and tweaks