shortened delay
Merge branch 'new_nav' into dryrub