Some optimizations for the staff front end