windows and osx layouts updated