More clean up
Bug fixes from previous clean up
- More code clean up
- Minor corrections in prefs
- all 3 columns in the menu have also the same same