Refining the mobile navigation a bit more