Small fixes to the layout