Fixes to movement behavior and checkbox