Added ToggleOrder

Added Toggle order and fiexed some bug