Reorganizing views with an eye towards cleaning them up
Removing old admin views in favor of the new ones