several fixes to layout and styling