Tweaks

Simplify and use jQuery-Hammer