Added Mac UI fix