Small GUI fixes