Bug fix and improvements

Bug fix and improvements (Top 20 friends and followers)