better Button recognition with onscreen nav buttons
Merge remote-tracking branch 'origin/master'