Added some fixes to GUI.
Merge branch 'gui_fixes' into develop