Manual merged part of Updaing-UI Branch into master...as far as I can tell everything functions the same so far.
Merge branch 'master' of https://github.com/kellyelton/OCTGN