bug fix and more controls in admin-edit