Merge "Yangman app base layout"