Updated UI. Refactored unit/integration tests.