bug fix on click, still has UX/UI issues