MEDIUM / Repairing UI layer after refactoring / WIP