Added sortables and click handlers