[#626] Use helper functions to get orgs/groups for dashboard plus cleanups