add screens, remove redurant screens, edit click element