Added settings and contacts improvements