1step refactoring/clean UI for admin finished