Improving general navigation behaviour 

especially some special cases denpending on the types of actions on queue