Small GUI fixes / improvements