Fix/v0.9.9.16

- Fixed as many of the i18n issues I could find
- Better indenting on files we changed
- Better labeling inside of templates we have changed