Fixed more issues with sliding navigation; made detection of cases where the toolbar is next to the navigation more robust.