working on admin page, refactoring files