Fixed settings menu

Menu was broken after merge
Also fixed gitignore
Gitignore