Updated the application layout and views