merge
admin app route
frontend refactor