changes and fixes to layout and alignment