Mac UI version 1.1

- Added same changes as Windows version