Fix bugs, improve UI