fixed bugs
new ui