Merged dashboard refactor back into v1.61 (actually did it this time)