clean up ui
get new ui working