Improve close button markup