Changed template
Changed template
Changed columns titles
Comment cleanup
Just better indentation
Minor changes