Some GUI fixes