Use the right naming for the dashboard
Fixed merge issues with dash template