diff --git a/src/applications/project/controller/PhabricatorProjectBoardManageController.php b/src/applications/project/controller/PhabricatorProjectBoardManageController.php
index db4dfe31be..75bff07106 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardManageController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardManageController.php
@@ -1,174 +1,179 @@
 <?php
 
 final class PhabricatorProjectBoardManageController
   extends PhabricatorProjectBoardController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $board_id = $request->getURIData('projectID');
 
     $board = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->withIDs(array($board_id))
       ->needImages(true)
       ->executeOne();
     if (!$board) {
       return new Aphront404Response();
     }
     $this->setProject($board);
 
     // Perform layout of no tasks to load and populate the columns in the
     // correct order.
     $layout_engine = id(new PhabricatorBoardLayoutEngine())
       ->setViewer($viewer)
       ->setBoardPHIDs(array($board->getPHID()))
       ->setObjectPHIDs(array())
       ->setFetchAllBoards(true)
       ->executeLayout();
 
     $columns = $layout_engine->getColumns($board->getPHID());
 
     $board_id = $board->getID();
 
     $header = $this->buildHeaderView($board);
     $actions = $this->buildActionView($board);
     $properties = $this->buildPropertyView($board);
 
     $properties->setActionList($actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Workboard'), "/project/board/{$board_id}/");
     $crumbs->addTextCrumb(pht('Manage'));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     $nav = $this->getProfileMenu();
 
     $title = array(
       pht('Manage Workboard'),
       $board->getDisplayName(),
     );
 
     $columns_list = $this->buildColumnsList($board, $columns);
 
     return $this->newPage()
       ->setTitle($title)
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->appendChild(
         array(
           $box,
           $columns_list,
         ));
   }
 
   private function buildHeaderView(PhabricatorProject $board) {
     $viewer = $this->getRequest()->getUser();
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setHeader(pht('Workboard: %s', $board->getDisplayName()));
 
     return $header;
   }
 
   private function buildActionView(PhabricatorProject $board) {
     $viewer = $this->getRequest()->getUser();
     $id = $board->getID();
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $board,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $reorder_uri = $this->getApplicationURI("board/{$id}/reorder/");
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-exchange')
         ->setName(pht('Reorder Columns'))
         ->setHref($reorder_uri)
         ->setDisabled(!$can_edit)
         ->setWorkflow(true));
 
     $background_uri = $this->getApplicationURI("board/{$id}/background/");
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-paint-brush')
         ->setName(pht('Change Background Color'))
         ->setHref($background_uri)
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $disable_uri = $this->getApplicationURI("board/{$id}/disable/");
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-ban')
         ->setName(pht('Disable Board'))
         ->setHref($disable_uri)
         ->setDisabled(!$can_edit)
         ->setWorkflow(true));
 
     return $actions;
   }
 
   private function buildPropertyView(
     PhabricatorProject $board) {
     $viewer = $this->getRequest()->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($board);
 
     $background = $board->getDisplayWorkboardBackgroundColor();
     if ($background !== null) {
       $map = PhabricatorProjectWorkboardBackgroundColor::getOptions();
       $map = ipull($map, 'name');
 
       $name = idx($map, $background, $background);
       $properties->addProperty(pht('Background Color'), $name);
     }
 
     return $properties;
   }
 
   private function buildColumnsList(
     PhabricatorProject $board,
     array $columns) {
     assert_instances_of($columns, 'PhabricatorProjectColumn');
 
     $board_id = $board->getID();
 
     $view = id(new PHUIObjectItemListView())
       ->setNoDataString(pht('This board has no columns.'));
 
     foreach ($columns as $column) {
       $column_id = $column->getID();
 
+      $proxy = $column->getProxy();
+      if ($proxy && !$proxy->isMilestone()) {
+        continue;
+      }
+
       $detail_uri = "/project/board/{$board_id}/column/{$column_id}/";
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($column->getDisplayName())
         ->setHref($detail_uri);
 
       if ($column->isHidden()) {
         $item->setDisabled(true);
       }
 
       $view->addItem($item);
     }
 
     return id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Columns'))
       ->setObjectList($view);
   }
 
 
 }
diff --git a/src/applications/project/controller/PhabricatorProjectColumnEditController.php b/src/applications/project/controller/PhabricatorProjectColumnEditController.php
index 9f880b9515..fb0c7b0910 100644
--- a/src/applications/project/controller/PhabricatorProjectColumnEditController.php
+++ b/src/applications/project/controller/PhabricatorProjectColumnEditController.php
@@ -1,148 +1,150 @@
 <?php
 
 final class PhabricatorProjectColumnEditController
   extends PhabricatorProjectBoardController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
     $project_id = $request->getURIData('projectID');
 
     $project = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->withIDs(array($project_id))
       ->needImages(true)
       ->executeOne();
 
     if (!$project) {
       return new Aphront404Response();
     }
     $this->setProject($project);
 
     $is_new = ($id ? false : true);
 
     if (!$is_new) {
       $column = id(new PhabricatorProjectColumnQuery())
         ->setViewer($viewer)
         ->withIDs(array($id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$column) {
         return new Aphront404Response();
       }
     } else {
       $column = PhabricatorProjectColumn::initializeNewColumn($viewer);
     }
 
     $e_name = null;
     $e_limit = null;
 
     $v_limit = $column->getPointLimit();
     $v_name = $column->getName();
 
     $validation_exception = null;
     $base_uri = '/board/'.$project_id.'/';
     if ($is_new) {
       // we want to go back to the board
       $view_uri = $this->getApplicationURI($base_uri);
     } else {
       $view_uri = $this->getApplicationURI($base_uri.'column/'.$id.'/');
     }
 
     if ($request->isFormPost()) {
       $v_name = $request->getStr('name');
       $v_limit = $request->getStr('limit');
 
       if ($is_new) {
         $column->setProjectPHID($project->getPHID());
         $column->attachProject($project);
 
         $columns = id(new PhabricatorProjectColumnQuery())
           ->setViewer($viewer)
           ->withProjectPHIDs(array($project->getPHID()))
           ->execute();
 
         $new_sequence = 1;
         if ($columns) {
           $values = mpull($columns, 'getSequence');
           $new_sequence = max($values) + 1;
         }
         $column->setSequence($new_sequence);
       }
 
       $xactions = array();
 
+      $type_name = PhabricatorProjectColumnTransaction::TYPE_NAME;
+      $type_limit = PhabricatorProjectColumnTransaction::TYPE_LIMIT;
+
       if (!$column->getProxy()) {
-        $type_name = PhabricatorProjectColumnTransaction::TYPE_NAME;
         $xactions[] = id(new PhabricatorProjectColumnTransaction())
           ->setTransactionType($type_name)
           ->setNewValue($v_name);
       }
 
-      $type_limit = PhabricatorProjectColumnTransaction::TYPE_LIMIT;
       $xactions[] = id(new PhabricatorProjectColumnTransaction())
         ->setTransactionType($type_limit)
         ->setNewValue($v_limit);
 
       try {
         $editor = id(new PhabricatorProjectColumnTransactionEditor())
           ->setActor($viewer)
           ->setContinueOnNoEffect(true)
+          ->setContinueOnMissingFields(true)
           ->setContentSourceFromRequest($request)
           ->applyTransactions($column, $xactions);
         return id(new AphrontRedirectResponse())->setURI($view_uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $e_name = $ex->getShortMessage($type_name);
         $e_limit = $ex->getShortMessage($type_limit);
         $validation_exception = $ex;
       }
     }
 
     $form = id(new AphrontFormView())
       ->setUser($request->getUser());
 
     if (!$column->getProxy()) {
       $form->appendChild(
         id(new AphrontFormTextControl())
           ->setValue($v_name)
           ->setLabel(pht('Name'))
           ->setName('name')
           ->setError($e_name));
     }
 
     $form->appendChild(
       id(new AphrontFormTextControl())
         ->setValue($v_limit)
         ->setLabel(pht('Point Limit'))
         ->setName('limit')
         ->setError($e_limit)
         ->setCaption(
           pht('Maximum number of points of tasks allowed in the column.')));
 
     if ($is_new) {
       $title = pht('Create Column');
       $submit = pht('Create Column');
     } else {
       $title = pht('Edit %s', $column->getDisplayName());
       $submit = pht('Save Column');
     }
 
     return $this->newDialog()
       ->setWidth(AphrontDialogView::WIDTH_FORM)
       ->setTitle($title)
       ->appendForm($form)
       ->setValidationException($validation_exception)
       ->addCancelButton($view_uri)
       ->addSubmitButton($submit);
 
   }
 }