Changed layout, added some more stuff