Improved plot layout