Changing the layout to be more streamlined