refactor UX: onely one screen now