Extend

More changes on template site