Fixed a clicking bug
Added task shifting