Fix some minor issues in the dashboard views/templates
Fix duplicate dashboard navigation