Feature/107 refactor admin