Further tests and changes to UI.