Working on some more templates including the feedback page
Added commenting
resolved name changes to files