Final dashboard merging to master