Fixes for mobile navigation