Fixed issue with GUI language selection [checked menu item]
Data model refactoring