Rearranged Ui and corrected bug in friend map