Final template fixes