Improved Gruntfile and styles