Improved tablet and smartphone versions