Improving accordion and tooltip