Working on dashboards + view bugs