<header id='header' class='hidden-print'>
  <nav class="navbar navbar-fixed-top" role="navigation">
    <div class="navbar-header">
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
        <span class="sr-only">Toggle navigation</span>
        <span class="icon-bar"></span>
        <span class="icon-bar"></span>
        <span class="icon-bar"></span>
      </button>
      <%= link_to image_tag('georgia/logo.png', alt: 'Georgia'), main_app.root_url, class: 'navbar-brand' %>
    </div>

    <% if signed_in? %>
      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
        <ul class="nav navbar-nav navbar-right">
          <li class='header-mail'>
            <%= link_to icon_tag('envelope fa-2x'), '#' %>
          </li>
          <li class='dropdown'>
            <%= link_to '#', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do %>
              <%= image_tag avatar_url(current_user), alt: '' %> <%= content_tag(:b, nil, class: 'caret') %>
            <% end -%>
            <ul class="dropdown-menu">
              <li><%= link_to('Logout', destroy_user_session_path, method: :delete) %></li>
            </ul>
          </li>
        </ul>
      </div>
    <% end -%>
  </nav>
</header>
<header id='header' class='hidden-print'>
  <nav class="navbar navbar-fixed-top" role="navigation">
    <div class="navbar-header">
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
        <span class="sr-only">Toggle navigation</span>
        <span class="icon-bar"></span>
        <span class="icon-bar"></span>
        <span class="icon-bar"></span>
      </button>
      <%= link_to image_tag('georgia/logo.png', alt: 'Georgia'), main_app.root_url, class: 'navbar-brand' %>
    </div>

    <% if signed_in? %>
      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
        <ul class="nav navbar-nav navbar-right">
          <li class='dropdown'>
            <%= link_to '#', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do %>
              <%= image_tag avatar_url(current_user), alt: '' %>
              <span><%= current_user.name %></span>
              <%= content_tag(:b, nil, class: 'caret') %>
            <% end -%>
            <ul class="dropdown-menu">
              <li><%= link_to('Logout', destroy_user_session_path, method: :delete) %></li>
            </ul>
          </li>
        </ul>
      </div>
    <% end -%>
  </nav>
</header>
Remove mailing from header and add username
Remove mailing from header and add username
