MS-219: make close button work better
- Fix indentation and comments
Merge branch 'MS-219-close-button' into develop