A bit refactoring + admin tweaks