Bug2046/staffpage

This covers all the changes submitted by different folks that I could find.