Layouts
Fixed merge conflicts
Fixed merge conflicts