Reworked the layout a bit to make things easier on ourselves