Fix incorrect event naming in top nav
Fix issues with nav on touch screens