Add grunt task
Improve UI