Admin CP fixes from rewrite