fixed abstact navigation issues