Finish Admin Section

Finish Admin Section + Some refactoring