Some fixes for mobile version