Improved some tap targets.

Partially resolves issue #94.