Changed the layout around a little