Layout fixes

Vadym Tishchenko requested to merge vadym/layout into master

Fixes: #88 (closed)

Fixes: #71 (closed)

Fixes: #85 (closed)

Fixes: #105 (closed)

Edited by Vadym Tishchenko

Merge request reports