Merged dashboard code from the master branch