page add form reordering & language improvements
Merge pull request #27 from ray176/pageAddTemplateReordering

page add form reordering & language improvements