Redesign funding clusters and student contribution bands