Refactor and bug fix for block clicking