DIY: Formatting and layout fixes