simple cleanup
ui tweak
cleanup