Add overriden methods
Add save/restore code
Fix landscape layout
Fix result saving
Update landscape layout