Changed dashboard rendering logic
Some minor fixtures
DRY routes for dashboard
Revert "DRY routes for dashboard"

This reverts commit 08318af493bb3cd32ea0be42321e446fb92b32fb.
Merge branch 'dev' into dashboard

Conflicts:
	client/main/index.js
Git fix