Started major cleanup of admin code, edit handlers in this commit