Updated layouts to work with a grid system, also changed the style around a bit