Misc content and layout fixes.