Gruntfile cleanup and UI changes