fixed more issues with on click listeners