Move clicks outside
Merge pull request #40 from kelvinblade/master

Move clicks outside