Make rank/org toggle more user friendly