Also submit button at the bottom of the setting templates
General template clean up
Add missing </p> tag