Minor fixes to the layout