test
fix bug, update and improve UI