Solving bugs
Solving some bugs
test ui bug
solved ui bug