pre major UI refactoring