Refactored input areas for edit/create