Mac UI changes. Closes #538
Enable mapping matrix code for #538