Release5

Fixing user experience issue on mobile