diff --git a/app/controllers/accounts.coffee b/app/controllers/accounts.coffee
index d778bd6d..7286d5b4 100644
--- a/app/controllers/accounts.coffee
+++ b/app/controllers/accounts.coffee
@@ -1,10 +1,5 @@
 `import Ember from 'ember'`
 
-Controller = Ember.ArrayController.extend
-  tab: 'accounts'
-
-  userName: (->
-    @get('user.name') || @get('user.login')
-  ).property('user.login', 'user.name')
+Controller = Ember.ArrayController.extend()
 
 `export default Controller`
diff --git a/app/controllers/profile.coffee b/app/controllers/profile.coffee
index 867f4c7c..bf9443f7 100644
--- a/app/controllers/profile.coffee
+++ b/app/controllers/profile.coffee
@@ -21,9 +21,4 @@ Controller = Ember.Controller.extend
   connectTab: (tab) ->
     @set('tab', tab)
 
-  billingUrl: (->
-    id = if @get('account.type') == 'user' then 'user' else @get('account.login')
-    "#{@get('config').billingEndpoint}/subscriptions/#{id}"
-  ).property('account.login', 'account.type')
-
 `export default Controller`
diff --git a/app/templates/components/org-item.hbs b/app/templates/components/org-item.hbs
index 850ac31a..830ce530 100644
--- a/app/templates/components/org-item.hbs
+++ b/app/templates/components/org-item.hbs
@@ -1,14 +1,14 @@
 <div class="media-elem">
   {{#if avatarUrl}}
-    <img src={{avatarUrl}} alt="avatar">
+    <img src={{avatarUrl}} alt="{{name}} avatar">
   {{else}}
     <div class="default-avatar--profile"></div>
   {{/if}}
 </div>
 <div class="media-body">
   {{#link-to "account" account.login}}
-    <h2>{{account.login}}</h2>
-    <p>Repositories <strong>{{reposCount}}</strong></p>
+    <h2>{{name}}</h2>
+    {{#if account.reposCount}}<p>Repositories <strong>{{account.reposCount}}</strong></p>{{else}}No repositories{{/if}}
   {{/link-to}}
 
   {{#if isUser}}
diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs
index 7673c395..03b7513b 100644
--- a/app/templates/profile/accounts.hbs
+++ b/app/templates/profile/accounts.hbs
@@ -11,9 +11,10 @@
   {{/each}}
   </ul>
 </section>
+
 {{#if config.githubOrgsOauthAccessSettingsUrl}}
   <section class="profile-additional">
     <p>Is an organization missing?<br>
-      <a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Orgs Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
+      <a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Organizations Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
   </section>
 {{/if}}
diff --git a/app/views/profile-accounts.coffee b/app/views/profile-accounts.coffee
index 20a32553..52369a75 100644
--- a/app/views/profile-accounts.coffee
+++ b/app/views/profile-accounts.coffee
@@ -5,9 +5,5 @@ View = BasicView.extend
   classNames: ['profile-orglist', 'columns', 'medium-4']
   tagName: 'aside'
   templateName: 'profile/accounts'
-  classAccounts: (->
-    'active' if @get('tab') == 'accounts'
-  ).property('tab')
-
 
 `export default View`