Fixing small displays issues