#536 added dropdown to edit page as well as edit controller logic