Update template columns
Update checking if picker can close
Update click handler
Support click, focus events based on type