=added multiple pages to the config screen.
Merge remote-tracking branch 'origin/master'