Updated the plot templates

Better page layout in both

Python now using the matplotlib tight_layout() command to file the page
on saved figures.