Template changes

Easier to use full width, simplified templates