committing changes with Kristi

Changes to admin functionality and some CSS
Merge branch 'mattKrist2'