working on admin portal continued