Checking files not on github
Solving minor conflicts on Menu