fixes for tablet and mobile