Allow click bypass for 3rd party support
Shuffle things around