improve the ui
tidy