More bug fixes from #11

Moves tab override param back from 'click' to 'useClick'