Improve up & down labels UI design
Merge branch 'new-design'