added some more fixes to the layout