Add some margin
Do not update if same state is selected