Tweaks

Fixing minor template issues