Fixes for mobile version