Misc GUI fixes