Closer to looking like OSX, almost there