Gui design

Attempt to merge GUI and master