GUI fixes
more GUI fixes