Added correct layouts,
added combos in Report part,
Some fixes
Merge branch 'master' of https://github.com/Ivan-Zhukau/conforg-desktop