Controller and TUI modified