Manage Shifts + minor tweaks