Condensed the admin listing and tightened up the logic that hides the form