Improve UI layout, Fix some bug