Reworked the default layout to make it what it should be.