Added Landscape support
Code refactoring