Improve the dashboard template and driver scripts
Merge branch 'improve-dashboards' into benderapp

* improve-dashboards:
  Improve the dashboard template and driver scripts