Added edit settings and follow feature