Enhance admin for edit mode