Fix Mac UI issues