Fix bugs and improve UI design.