Merge settings tabs- view changes

#56