Cosmetic GUI fixes