fixed nav arrow positioning
fixing merge conflicts