Main Menu progress
Fix merge errors