Cleaned up behavior of dashboard.
Resolved #179 and #220.