More width fixes

More fixes to the width of the window vs content.