Improved the dashboard
Merge