Some layout fixes and tweaks