UI refactor - Junit, doc and more