                 reminderCell.isHidden = true
                 return 0.0
             }
-        } else if wakeTimePickerHidden && indexPath.section == 1 && indexPath.row == 3 {
-<<<<<<< HEAD
-                return 0.0
-        } else if sleepTimePickerHidden && indexPath.section == 1 && indexPath.row == 5 {
-            return 0.0
-=======
+        } else if birthdayPickerHidden && indexPath.section == 1 && indexPath.row == 2 {
             return 0
-        } else if sleepTimePickerHidden && indexPath.section == 1 && indexPath.row == 5 {
+        } else if wakeTimePickerHidden && indexPath.section == 3 && indexPath.row == 3 {
             return 0
->>>>>>> origin/master
+        } else if sleepTimePickerHidden && indexPath.section == 3 && indexPath.row == 5 {
+            return 0
         } else {
             return super.tableView(tableView, heightForRowAt: indexPath)
         }
     }
 
 // MARK: Functions
-    
-    // Sets cell background colour according to active state
-    func toggleTimePickerColor(label: UILabel, timePickerHidden: Bool) {
-        if timePickerHidden == false {
-            label.textColor = UIColor(red: 21/255, green: 126/255, blue: 251/255, alpha: 1)
-        }
-        if timePickerHidden == true {
-            label.textColor = UIColor.black
-        }
-    }
-    
-    // If timePickerChanged
-    func timePickerChanged (label: UILabel, picker: UIDatePicker) {
-        label.text = DateFormatter.localizedString(from: picker.date, dateStyle: DateFormatter.Style.none, timeStyle: DateFormatter.Style.short)
-    }
     
     // Add done button to numpad
     

        self.tableView.endUpdates()
    }
    
    @IBAction func wakeTimePickerChanged(_ sender: Any) {
        timePickerChanged(label: wakeTimeLabel, picker: wakeTimePicker)
    }
    
    @IBAction func sleepTimePickerChanged(_ sender: Any) {
        timePickerChanged(label: sleepTimeLabel, picker: sleepTimePicker)
    }
    
    
    
    var time: String = "60" {
        didSet {
            timeLabel.text? = time

                
                let alert = UIAlertController(title: "Choose a valid time", message: "Choose a sleep time later than the wake time.", preferredStyle: .alert)
                
                let OKAction = UIAlertAction(title: "Dismiss", style: .default) { (action) in
                }
                
                alert.addAction(OKAction)
