     }
 
     func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+
         switch indexPath.section {
+
         case Section.Info.rawValue:
 
             switch indexPath.row {
-            case InfoRow.Name.rawValue:
+
+            case InfoRow.Username.rawValue:
                 return 60
 
+            case InfoRow.Nickname.rawValue:
+                return 60
+
             case InfoRow.Intro.rawValue:
+
                 let tableViewWidth = CGRectGetWidth(editProfileTableView.bounds)
                 let introLabelMaxWidth = tableViewWidth - YepConfig.EditProfile.introInset
 

                return cell

            case InfoRow.Intro.rawValue:
                let cell = tableView.dequeueReusableCellWithIdentifier(editProfileMoreInfoCellIdentifier) as! EditProfileMoreInfoCell

                cell.annotationLabel.text = NSLocalizedString("Introduction", comment: "")


            switch indexPath.row {

            case InfoRow.Nickname.rawValue:
                performSegueWithIdentifier("showEditNicknameAndBadge", sender: nil)

            default:
