borlox (5):
      5f55299: - some refactoring
      7ef16ec: - refac of options table creation
      6909d6c: -removed some debugging artifacts
      581c8ca: Fixed merge conflicts
      ebba849: - reorderd settings in gui

