adding a new screen and fixing error handling