first draft of gui
Merge branch 'origin/master'