Admin page changes and fixes