various formatting and layout fixes