add screens, remove redurant screens