more GUI fixes