review collapse. Some small fixes for modal/confirm