Added reset buttons/actions | Updated screens