Update form layout
Fix item url parsing
Grunt build