UI refactor continues.