Refactor

online/ and admin/ refactoring