Improve behaviour on tablets and phones