Made settings work from main menu, removed some redundant includes