some formatting and layout fixes