Cleaning up mouse click code and adding UI adjustments from the demo-ready code.