More GUI fixes