Reduced scope of transition to specific nav element. Fixed performance bug.