Nav and interaction improvements

fixes #111  #114 

@ronichoudhury / @jbeezley please approve.