Fix tests, clean up UI a bit