wine menu updated layout and styles
fix conflicts with master