Update for Mac UI