fixed welcome screen & fares page