Formatting and layout fixes