adding settings and homeapge with mallika and my changes