Minor clean up to authorization rules file
Partial work in restoring sidebar role selection behavior