UI improvements, misc bug fix