Modify generate event in arena and layout in main menu
Merge branch 'TH-Layout' into dev1.0