Improve navigation and add landscape layout