More Changes to the layout