Tap gesture fixes
First part of simplification refactoring
Second part of simplification refactoring
Third part of simplification refactoring