Various improvements for small screens