Cleanup, max width fixes