Refactoring
Some layout changes
Changed layout to landscape