Fix a couple of bugs in the controller menu & file config loader.
Clean up a little code