begin to rework admin area