Reworked Directory admin pages