Merge pull request #230 from lowi0008/master

(fix) data issues on dashboard, (update) simplify language on views"
(fix) fix routing issues--attempted