Issue #77, modifies dashboard view and controller