Modified ui a bit.
Updated tests to work with ui changes.