Dashboard rationalization

Change-Id: Ifb3f4091625b34cfefc484308f6102f7a36937a7
Closes-bug: PROD-20098
7 files changed