Major template Overhaul