Improve touch, and more work on page 3