UI update to support MacOS