HACK-592: add visible close buttons in modal header and footer