admin deep refactoring
admin logs added
Merged with setup branch