Last refactor on UI.