some cleanup and DRYing of admin layouts [Finishes #69933716]