Fixed bugs for category admin class, small tweaks