More gui work, the gui is almost done now, just need to add the bits and bobs