Fixed up menu

Merge Conflict fixing