visual fixes
Merge branch 'friendList' into demo
merge push