Improving base templates