Reduced helper method code and added drop down for type field and fixed link issue.