fixes to the layout