refactored screens and stages, added editor stage