UI improvements
Merge branch '1-5-stable'