grunt fix, form changes, style changes