Tidy conditional
Add UI input event listener and a temp fix for the scrolling issue