Second try: Gui code
Merge branch 'gui_dev'