Use GridSpec for presentation of final plot
Merge branch 'optimize-display'