slight refactor and better add screen