Added landscape layout and save state capability