Improve jshint task coverage
Improve display and flow