Several GUI fixes