Fixes layouts
Merge upstream