Admin edit updates

DEPENDS ON #6. Will need a rebase.