added percentages on the dashboard
fix merge conflict