emuns refactoring + admin edit