refactor, screens, readme