some improvements to the UI