Staff fixes

Lots of code updates, new branding