Integrated some custom admin stuff (from Jon Mick site)