UI beautification for Mac; close bug #5.