Add some feedback on click (WIP)
Minor fixes