Small misc GUI fixes