Add UI improvements, fix bugs