Fix/gui

Please review @mkurek.
for mockup..