dashboard updates, locations broken out into seperate answers
Merge remote-tracking branch 'origin/master' into multi-answer