Enhance admin for edit mode/2