Final commit added friends screen