Templates cleanup, removed unnecessary code, sized down template items ty @handsomematt for review