More layout polish and tweaks.