Fixes for devices with small screens