Fixes to toggle active/prior