Grammatical fixes, refactored template button creation

Small update