2.2 Dashboard enhancements

Closes #556