added the onclick handlers
fixed merge