Cleaned up admin rights, map view