Added more to the GUI stuff