Changed template
Merge branch 'mainDashboard'