Admin panel

Updating the admin panel with the most recent changes from master branch?