Added ability to navigate with right click