Update Gruntfile
Rework JS and Styles