Updated - navigation fixed