lot of work done on admin page