Worked on adding settings feature