Fixed another test, made UI a little better.
Merged