moving click method to single line
Merge branch 'master' into features/squirrel-house-progress