Moving Cohort dropdown and 'Set as default' button from dashboard to cohort
Fixing merging conflicts