Made some spacing adjustments on Templates