Close by default when hiding modal
Discard/save button tweaks