Rework Dashboard

Rework Dashboard