Fixed user interaction bug
Merge branch 'Notes'