dashboard is changed according to new DB and new convensions
dashboard is working fine after merging conflicts
again merged dashboard is working