edited UX + added user flow control