First steps to apply parallelism (not tested yet!!!)
Changed XAML in UserControls
Merge pele into mazanuj