Add close-button to all containers

refs #6216
Merge branch 'feature/close-detail-area-6216'

resolves #6216