More modifications to fix overlapping on the navigation bar in mobile.