         self.settingsButton.image = NSImage(named: "settings-button")
         self.settingsButton.bordered = false
 
-        self.taskTextField.frame = NSMakeRect(50, Constant.Window.Height - 29, Constant.Window.Width - 100, 20)
+        self.taskTextField.frame = NSMakeRect(50, Constant.Window.Height - 31, Constant.Window.Width - 100, 22)
         self.taskTextField.bezeled = false
         self.taskTextField.bordered = false
-        self.taskTextField.editable = false
-        self.taskTextField.selectable = true
         self.taskTextField.backgroundColor = NSColor.clearColor()
-        self.taskTextField.textColor = NSColor(calibratedHue:0, saturation:0, brightness:0.65, alpha:1)
+        self.taskTextField.textColor = NSColor(calibratedHue:0, saturation:0, brightness:0.2, alpha:1)
         self.taskTextField.alignment = NSTextAlignment.CenterTextAlignment
-        self.taskTextField.stringValue = "Enter your new task..."
+        self.taskTextField.placeholderString = "Enter your new task..."
         self.taskTextField.font = NSFont(name: "HelveticaNeue", size: 18)
         self.taskTextField.focusRingType = NSFocusRingType.None
 
         self.timerTextField.frame = NSMakeRect(40, Constant.Window.Height/4 + 30, Constant.Window.Width - 80, 0)
-        self.timerTextField.bezeled = false
-        self.timerTextField.bordered = false
-        self.timerTextField.editable = false
+        self.timerTextField.editable = true
         self.timerTextField.selectable = true
         self.timerTextField.backgroundColor = NSColor.clearColor()
         self.timerTextField.textColor = NSColor(calibratedHue:0, saturation:0, brightness:0.2, alpha:1)
         self.timerTextField.alignment = NSTextAlignment.CenterTextAlignment
-        self.timerTextField.stringValue = "15:00"
+        self.timerTextField.string = "15:00"
         self.timerTextField.font = NSFont(name: "AvenirNextCondensed-DemiBold", size: 85)
         self.timerTextField.sizeToFit()
-        self.timerTextField.frame = NSMakeRect((Constant.Window.Width - self.timerTextField.frame.width)/2, (Constant.Window.Height - self.timerTextField.frame.height)/2 + 22.5, self.timerTextField.frame.width, self.timerTextField.frame.height)
+        self.timerTextField.frame = NSMakeRect((Constant.Window.Width - self.timerTextField.frame.width)/2, (Constant.Window.Height - self.timerTextField.frame.height)/2 + 10, self.timerTextField.frame.width, self.timerTextField.frame.height)
         self.timerTextField.focusRingType = NSFocusRingType.None
+        self.timerTextField.maxSize = CGSize(width: self.timerTextField.frame.width, height: self.timerTextField.frame.height)
     }
 
     // MARK: Action handlers
 
     func onStartWorkingButtonPressed() {
-        self.timerTextField.resignFirstResponder()
+
+    }
+
+    // MARK: NSTextView delegate methods
+
+    func textView(textView: NSTextView, shouldChangeTextInRanges affectedRanges: [AnyObject], replacementStrings: [AnyObject]?) -> Bool {
+        let stringChanged = replacementStrings?.first as! String
+        if stringChanged == "\n" {
+            return false
+        }
+
+        return true
     }
 
     // MARK: Helper methods

    let taskButton = NSButton()
    let settingsButton = NSButton()
    let taskTextField = NSTextField()
    let timerTextField = NSTextField()

    override func loadView() {
        self.view = NSView()

import Cocoa

class PopoverController: NSViewController, NSPopoverDelegate, NSTextViewDelegate {

    let popover = NSPopover()
    let addTaskButton = NSButton()
