Implemented better touch navigation #13