Fix for Mac + format layout options