UI improvements, bug correction