Refactored drop down list in fields
Small update in grunt file
Fixed issue #386