Merge branch 't/gui_improvements'