Added forms for popup
Fixed lodash mapping as underscore for lodash