Re-add touch device support for navigation - close #38