fixed admin scrolling issue
Merge pull request #217 from RTakes/conflictRes2

fixed admin scrolling issue