put the close button in a container

BugFix Merge Request

Related Issue

resolves #394 (closed)

Description of Bug and Fix

Put the close button in a container, in order for it to be aligned to the right:

---