Updated the layout