Bug fixes

Making the templates the same as the live