Add refresh buttons, Fix area deselection bug