Improve layouts

Merged username-removed-65452 requested to merge german into master