Fixes for small displays