Some minor fixes for mobile version