Small width device fixes