Quick fix for mobile experience