fixed #1; further improvements to UI