#4 Add button and remove button. Ugly!