Back to the old ui version

with some additional refactoring