Merge "GUI fixes"