#30 combining the admin and edit views