Added new icon for edit button, changed logic for data validation