Removed hard coded data for the vn dropdown in edit popup and related changes