WM: Cleanup, container padding/margin fixes