Overhaul of moveInQueue and queue style rules

Should fix the majority of issues with moving things.