Updated for tablet and desktop..