fix bugs and optimize layout
optimize UI
update UI