More Bug Fixes For Clickable Function