Improved usage on mobile