rework on admin page