Changed edits for Settings and Base to manifest