Gui

Merging gui with master