Changed the layout a tiny bit