Various GUI fixes