Many fix
Such state saving
Very update on click