nav and arrows final changes