fix save logic and clean up screens