- GUI fixes