Improve Grunt watch configuration
Design updates