fixes to layout and scaling