fixing admin page
Merge pull request #144 from RTakes/conflictRes

fixing admin page