Layout fixes

Vadym Tishchenko requested to merge vadym/layout-fixes into master
Edited by Vadym Tishchenko

Merge request reports