Add the dashboard states.
Merge branch 'dev-horizon' into develop