Fix landscape layout
Merge fix landscape