Settings page added
Merge remote-tracking branch 'origin/master'
cells updated. labels removed. using default textLabet