fix and add new screens