diff --git a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
index 62933aaa7..2ac3e6de8 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
@@ -1,176 +1,175 @@
 <?php
 
 final class PhabricatorPeopleProfileManageController
   extends PhabricatorPeopleProfileController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
     $id = $request->getURIData('id');
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->needProfile(true)
       ->needProfileImage(true)
       ->needAvailability(true)
       ->executeOne();
     if (!$user) {
       return new Aphront404Response();
     }
 
     $this->setUser($user);
     $header = $this->buildProfileHeader();
 
     $curtain = $this->buildCurtain($user);
     $properties = $this->buildPropertyView($user);
     $name = $user->getUsername();
 
     $nav = $this->getProfileMenu();
     $nav->selectFilter(PhabricatorPeopleProfileMenuEngine::ITEM_MANAGE);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Manage'));
     $crumbs->setBorder(true);
 
     $manage = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->addClass('project-view-home')
       ->addClass('project-view-people-home')
       ->setCurtain($curtain)
       ->addPropertySection(pht('Details'), $properties);
-    require_celerity_resource('project-view-css');
 
     return $this->newPage()
       ->setTitle(
         array(
           pht('Manage User'),
           $user->getUsername(),
         ))
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->appendChild(
         array(
           $manage,
         ));
   }
 
   private function buildPropertyView(PhabricatorUser $user) {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($user);
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $user,
       PhabricatorCustomField::ROLE_VIEW);
     $field_list->appendFieldsToPropertyList($user, $viewer, $view);
 
     return $view;
   }
 
   private function buildCurtain(PhabricatorUser $user) {
     $viewer = $this->getViewer();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $user,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $curtain = $this->newCurtainView($user);
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Profile'))
         ->setHref($this->getApplicationURI('editprofile/'.$user->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-picture-o')
         ->setName(pht('Edit Profile Picture'))
         ->setHref($this->getApplicationURI('picture/'.$user->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-wrench')
         ->setName(pht('Edit Settings'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit)
         ->setHref('/settings/user/'.$user->getUsername().'/'));
 
     if ($user->getIsAdmin()) {
       $empower_icon = 'fa-arrow-circle-o-down';
       $empower_name = pht('Remove Administrator');
     } else {
       $empower_icon = 'fa-arrow-circle-o-up';
       $empower_name = pht('Make Administrator');
     }
 
     $is_admin = $viewer->getIsAdmin();
     $is_self = ($user->getPHID() === $viewer->getPHID());
     $can_admin = ($is_admin && !$is_self);
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon($empower_icon)
         ->setName($empower_name)
         ->setDisabled(!$can_admin)
         ->setWorkflow(true)
         ->setHref($this->getApplicationURI('empower/'.$user->getID().'/')));
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-tag')
         ->setName(pht('Change Username'))
         ->setDisabled(!$is_admin)
         ->setWorkflow(true)
         ->setHref($this->getApplicationURI('rename/'.$user->getID().'/')));
 
     if ($user->getIsDisabled()) {
       $disable_icon = 'fa-check-circle-o';
       $disable_name = pht('Enable User');
     } else {
       $disable_icon = 'fa-ban';
       $disable_name = pht('Disable User');
     }
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon($disable_icon)
         ->setName($disable_name)
         ->setDisabled(!$can_admin)
         ->setWorkflow(true)
         ->setHref($this->getApplicationURI('disable/'.$user->getID().'/')));
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-times')
         ->setName(pht('Delete User'))
         ->setDisabled(!$can_admin)
         ->setWorkflow(true)
         ->setHref($this->getApplicationURI('delete/'.$user->getID().'/')));
 
     $can_welcome = ($is_admin && $user->canEstablishWebSessions());
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-envelope')
         ->setName(pht('Send Welcome Email'))
         ->setWorkflow(true)
         ->setDisabled(!$can_welcome)
         ->setHref($this->getApplicationURI('welcome/'.$user->getID().'/')));
 
     return $curtain;
   }
 
 
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
index 769d82ffe..7a03e0024 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
@@ -1,420 +1,419 @@
 <?php
 
 final class PhabricatorPeopleProfileViewController
   extends PhabricatorPeopleProfileController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
     $username = $request->getURIData('username');
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withUsernames(array($username))
       ->needProfileImage(true)
       ->needAvailability(true)
       ->executeOne();
     if (!$user) {
       return new Aphront404Response();
     }
 
     $this->setUser($user);
     $header = $this->buildProfileHeader();
 
     $properties = $this->buildPropertyView($user);
     $name = $user->getUsername();
 
     $feed = $this->buildPeopleFeed($user, $viewer);
     $feed = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Recent Activity'))
       ->addClass('project-view-feed')
       ->appendChild($feed);
 
     $projects = $this->buildProjectsView($user);
     $repo = $this->buildRepoView($user);
     $badges = $this->buildBadgesView($user);
     $calendar = $this->buildCalendarDayView($user);
-    require_celerity_resource('project-view-css');
 
     $home = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->addClass('project-view-home')
       ->addClass('project-view-people-home')
       ->setMainColumn(
         array(
           $properties,
           $feed,
         ))
       ->setSideColumn(
         array(
           $projects,
           $repo,
           $badges,
           $calendar,
         ));
 
     $nav = $this->getProfileMenu();
     $nav->selectFilter(PhabricatorPeopleProfileMenuEngine::ITEM_PROFILE);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setBorder(true);
 
     return $this->newPage()
       ->setTitle($user->getUsername())
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->appendChild(
         array(
           $home,
         ));
   }
 
   private function buildRepoView(
     PhabricatorUser $user) {
 
     $viewer = $this->getViewer();
 
     $repo_transaction = id(new PhabricatorRepositoryTransactionQuery())
       ->setViewer($viewer)
       ->withAuthorPHIDs(array($user->getPHID()))
       ->withTransactionTypes(array(PhabricatorTransactions::TYPE_CREATE))
       ->execute();
 
     if(!empty($repo_transaction)) {
       $repo_phids = mpull($repo_transaction, 'getObjectPHID');
       $repo = id(new PhabricatorRepositoryQuery())
         ->setViewer($viewer)
         ->withPHIDs($repo_phids)
         ->setOrder('committed')
         ->execute();
     }
 
     $header = id(new PHUIHeaderView());
 
     if (!empty($repo)) {
       $nb = count($repo);
       $limit = 5;
       $repo = array_slice($repo, 0, $limit);
       $list = new PHUIObjectItemListView();
       foreach($repo as $r){
         $list->addItem(
           id(new PHUIObjectItemView())
             ->setHeader($r->getName())
             ->addAttribute($r->getDisplayName())
             ->setHref($r->getURI()));
       }
 
       $header_text = pht('Repositories (%s)', $nb);
 
       if($nb > $limit) {
         $header->addActionLink(
           id(new PHUIButtonView())
             ->setTag('a')
             ->setIcon('fa-list-ul')
             ->setText(pht('View All'))
             ->setHref('/diffusion/?author=' . $user->getPHID() . '#R'));
       }
 
     } else {
       $header_text = pht('Repositories');
       $error = id(new PHUIBoxView())
         ->addClass('mlb')
         ->appendChild(pht('User does not have any repository.'));
       $list = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_NODATA)
         ->appendChild($error);
     }
 
     $header->setHeader($header_text);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($list)
       ->setBackground(PHUIObjectBoxView::GREY);
 
     return $box;
   }
 
   private function buildPropertyView(
     PhabricatorUser $user) {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($user);
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $user,
       PhabricatorCustomField::ROLE_VIEW);
     $field_list->appendFieldsToPropertyList($user, $viewer, $view);
 
     if (!$view->hasAnyProperties()) {
       return null;
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('User Details'));
 
     $view = id(new PHUIObjectBoxView())
       ->appendChild($view)
       ->setHeader($header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->addClass('project-view-properties');
 
     return $view;
   }
 
   private function buildProjectsView(
     PhabricatorUser $user) {
 
     $viewer = $this->getViewer();
     $projects = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->withMemberPHIDs(array($user->getPHID()))
       ->needImages(true)
       ->withStatuses(array(PhabricatorProjectStatus::STATUS_ACTIVE))
       ->withIcons(array('project'))
       ->execute();
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Projects'));
 
     if (!empty($projects)) {
       $limit = 5;
       $render_phids = array_slice($projects, 0, $limit);
       $list = id(new PhabricatorProjectListView())
         ->setUser($viewer)
         ->setProjects($render_phids);
 
       if (count($projects) > $limit) {
         $header_text = pht(
           'Projects (%s)',
           phutil_count($projects));
 
         $header = id(new PHUIHeaderView())
           ->setHeader($header_text)
           ->addActionLink(
             id(new PHUIButtonView())
               ->setTag('a')
               ->setIcon('fa-list-ul')
               ->setText(pht('View All'))
               ->setHref('/project/?member='.$user->getPHID().'#R'));
 
       }
 
     } else {
       $list = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_NODATA)
         ->appendChild(pht('User does not belong to any projects.'));
     }
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($list)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
 
     return $box;
   }
 
   private function buildCalendarDayView(PhabricatorUser $user) {
     $viewer = $this->getViewer();
     $class = 'PhabricatorCalendarApplication';
 
     if (!PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
       return null;
     }
 
     $midnight = PhabricatorTime::getTodayMidnightDateTime($viewer);
     $week_end = clone $midnight;
     $week_end = $week_end->modify('+3 days');
 
     $range_start = $midnight->format('U');
     $range_end = $week_end->format('U');
 
     $events = id(new PhabricatorCalendarEventQuery())
       ->setViewer($viewer)
       ->withDateRange($range_start, $range_end)
       ->withInvitedPHIDs(array($user->getPHID()))
       ->withIsCancelled(false)
       ->needRSVPs(array($viewer->getPHID()))
       ->execute();
 
     $event_views = array();
     foreach ($events as $event) {
       $viewer_is_invited = $event->isRSVPInvited($viewer->getPHID());
 
       $can_edit = PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $event,
         PhabricatorPolicyCapability::CAN_EDIT);
 
       $epoch_min = $event->getStartDateTimeEpoch();
       $epoch_max = $event->getEndDateTimeEpoch();
 
       $event_view = id(new AphrontCalendarEventView())
         ->setCanEdit($can_edit)
         ->setEventID($event->getID())
         ->setEpochRange($epoch_min, $epoch_max)
         ->setIsAllDay($event->getIsAllDay())
         ->setIcon($event->getIcon())
         ->setViewerIsInvited($viewer_is_invited)
         ->setName($event->getName())
         ->setDatetimeSummary($event->renderEventDate($viewer, true))
         ->setURI($event->getURI());
 
       $event_views[] = $event_view;
     }
 
     $event_views = msort($event_views, 'getEpochStart');
 
     $day_view = id(new PHUICalendarWeekView())
       ->setViewer($viewer)
       ->setView('week')
       ->setEvents($event_views)
       ->setWeekLength(3)
       ->render();
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Calendar'))
       ->setHref(
         urisprintf(
           '/calendar/?invited=%s#R',
           $user->getUsername()));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($day_view)
       ->addClass('calendar-profile-box')
       ->setBackground(PHUIObjectBoxView::GREY);
 
     return $box;
   }
 
   private function buildBadgesView(PhabricatorUser $user) {
 
     $viewer = $this->getViewer();
     $class = 'PhabricatorBadgesApplication';
 
     if (!PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
       return null;
     }
 
     $awards = array();
     $badges = array();
     if ($user->getBadgePHIDs()) {
       $awards = id(new PhabricatorBadgesAwardQuery())
         ->setViewer($viewer)
         ->withRecipientPHIDs(array($user->getPHID()))
         ->execute();
       $awards = mpull($awards, null, 'getBadgePHID');
 
       $badges = array();
       foreach ($awards as $award) {
         $badge = $award->getBadge();
         if ($badge->getStatus() == PhabricatorBadgesBadge::STATUS_ACTIVE) {
           $badges[$award->getBadgePHID()] = $badge;
         }
       }
     }
 
     if (count($badges)) {
       $flex = new PHUIBadgeBoxView();
 
       foreach ($badges as $badge) {
         if ($badge) {
           $awarder_info = array();
 
           $award = idx($awards, $badge->getPHID(), null);
           $awarder_phid = $award->getAwarderPHID();
           $awarder_handle = $viewer->renderHandle($awarder_phid);
 
           $awarder_info = pht(
             'Awarded by %s',
             $awarder_handle->render());
 
           $item = id(new PHUIBadgeView())
             ->setIcon($badge->getIcon())
             ->setHeader($badge->getName())
             ->setSubhead($badge->getFlavor())
             ->setQuality($badge->getQuality())
             ->setHref($badge->getViewURI())
             ->addByLine($awarder_info);
 
           $flex->addItem($item);
         }
       }
     } else {
       $flex = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_NODATA)
         ->appendChild(pht('User does not have any badges.'));
     }
 
     // Best option?
     $badges = id(new PhabricatorBadgesQuery())
       ->setViewer($viewer)
       ->withStatuses(array(
         PhabricatorBadgesBadge::STATUS_ACTIVE,
       ))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->execute();
 
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setIcon('fa-plus')
       ->setText(pht('Award'))
       ->setWorkflow(true)
       ->setHref('/badges/award/'.$user->getID().'/');
 
     $can_award = false;
     if (count($badges)) {
       $can_award = true;
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Badges'));
 
     if (count($badges)) {
       $header->addActionLink($button);
     }
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addClass('project-view-badges')
       ->appendChild($flex)
       ->setBackground(PHUIObjectBoxView::GREY);
 
     return $box;
   }
 
   private function buildPeopleFeed(
     PhabricatorUser $user,
     $viewer) {
 
     $query = new PhabricatorFeedQuery();
     $query->setFilterPHIDs(
       array(
         $user->getPHID(),
       ));
     $query->setLimit(100);
     $query->setViewer($viewer);
     $stories = $query->execute();
 
     $builder = new PhabricatorFeedBuilder($stories);
     $builder->setUser($viewer);
     $builder->setShowHovercards(true);
     $builder->setNoDataString(pht('To begin on such a grand journey, '.
       'requires but just a single step.'));
     $view = $builder->buildView();
 
     return $view->render();
 
   }
 
 }