Updated the application to conform to the layout in layout.html