Close enhancement #8.

Plus small UI beautification fix for Mac OS X.