updates to ui
clean up tests