some location fixes, simplifying
Merge branch 'master' of https://github.com/csm10495/cDashboard.git