Bug fixes to v1.5.8 and a UI improvement

Please refer to /release-notes/1.5.9.md for more detailed information