some ui rework and some bugs fixed