Merge pull request #915 from sylus/feature-wet-v3.1

Merge Feature wet v3.1 from sylus to wet-boew
Layout improvements