Settings Fixed
* Fixed Issues with Settings not loading correctly