Content layout fixes and tweaks