admin area refactor almost done