Started working on Admin CP and cleaning up code also