Fix/gui

Please review @mkurek.
Split it.