Initial GUI for app
Merge branch 'develop'