Trying to make window buttons look a bit more native on OS X 

Also, minor fixes/clean-ups.