WM: Margin and font fixes