Changed the layout a little bit