finished dashboard_final.js
fixing merge conflicts