Tweak currentWeek algorithm, fix 'edit picks' from view picks screen