Moved things around and changed gui