Changed the layout a bit