Inforpage

Trying to merge setting page into master