Made template smaller and cleaner