2.3

Let's clean up the admin screen, why don't we!