More GUI fixes.