polish ui
wip