Fixes for mobile and tablet