Improve small screen design
Merge branch 'release/v5.1.1'

* develop:
  Improve small screen design