Finish admin section

Finish admin section + some refactoring