GUI fixes
More GUI fixes