Changed the layout a bit, changed some code.