Refactored kontroll-ui - not all tests done yet