Friends Button + minor changes