GUI: Avoid a branch
TODOS
Major refactoring/simplification