close buttons completed
Merge branch 'close-button'