Fix some layout issues with subplots and guides.