Minor edits

* Moved some global variables
* Converted dictionary keys to strings
updated translation strings