#1 full refactoring of UI activities