admin minor fixes
admin update & some refactoring