Fixes for dashboarApp and dataApp templates