Admin panel update

Updating the admin panel with the most recent changes in the master branch.