Adjustments for Mobile Navigation

Added some adjustments to make the navigation work when on mobile state