template: More improvements to variant page