Minor changes to the layout