Adding settings fields
Correcting undefined index issues.
Merge branch '2.8'