Close buttons refactoring.
Merge branch 'master' of github.com:moklick/picsma