Re-organised the dashboard view