some UI improvements, bug fixes