Made some significant changes to the layout of the app