Merge "Settings new dashboard - part 1"