diff --git a/resources/views/layouts/project.blade.php b/resources/views/layouts/project.blade.php
index 86ba27c..160bf51 100755
--- a/resources/views/layouts/project.blade.php
+++ b/resources/views/layouts/project.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('title')
-{{ $project->name }} - @yield('subtitle', trans('project.show'))
+@yield('subtitle', __('project.detail')) - {{ $project->name }}
 @endsection
 
 @section('content')
@@ -11,7 +11,7 @@
     <div class="pull-right">
         @yield('action-buttons')
     </div>
-    {{ $project->name }} <small>@yield('subtitle', trans('project.show'))</small>
+    {{ $project->name }} <small>@yield('subtitle', __('project.detail'))</small>
 </h1>
 
 @include('projects.partials.nav-tabs')
diff --git a/resources/views/projects/partials/breadcrumb.blade.php b/resources/views/projects/partials/breadcrumb.blade.php
index a56abc7..aae5bdb 100644
--- a/resources/views/projects/partials/breadcrumb.blade.php
+++ b/resources/views/projects/partials/breadcrumb.blade.php
@@ -1,5 +1,5 @@
 <ul class="breadcrumb hidden-print">
-    <li>{{ link_to_route('projects.index',trans('project.projects'), ['status_id' => request('status_id', $project->status_id)]) }}</li>
-    <li>{{ $project->present()->projectLink }}</li>
-    <li class="active">{{ isset($title) ? $title : trans('project.show') }}</li>
+    <li>{{ link_to_route('projects.index',__('project.projects'), ['status_id' => request('status_id', $project->status_id)]) }}</li>
+    <li>{{ link_to_route('projects.show', $project->name, $project) }}</li>
+    <li class="active">@yield('subtitle', __('project.detail'))</li>
 </ul>
diff --git a/resources/views/projects/partials/nav-tabs.blade.php b/resources/views/projects/partials/nav-tabs.blade.php
index 7a5a706..22a184d 100644
--- a/resources/views/projects/partials/nav-tabs.blade.php
+++ b/resources/views/projects/partials/nav-tabs.blade.php
@@ -1,31 +1,31 @@
 <!-- Nav tabs -->
 <ul class="nav nav-tabs">
     <li class="{{ Request::segment(3) == null ? 'active' : '' }}">
-        {!! link_to_route('projects.show', trans('project.show'), [$project->id]) !!}
+        {!! link_to_route('projects.show', __('project.detail'), $project) !!}
     </li>
     @can('view-jobs', $project)
     <li class="{{ Request::segment(3) == 'jobs' ? 'active' : '' }}">
-        {!! link_to_route('projects.jobs.index', trans('project.jobs').' ('.$project->jobs->count().')', [$project->id]) !!}
+        {!! link_to_route('projects.jobs.index', __('project.jobs').' ('.$project->jobs->count().')', $project) !!}
     </li>
     @endcan
     @can('view-payments', $project)
     <li class="{{ Request::segment(3) == 'payments' ? 'active' : '' }}">
-        {!! link_to_route('projects.payments', trans('project.payments').' ('.$project->payments->count().')', [$project->id]) !!}
+        {!! link_to_route('projects.payments', __('project.payments').' ('.$project->payments->count().')', $project) !!}
     </li>
     @endcan
     @can('view-subscriptions', $project)
     <li class="{{ Request::segment(3) == 'subscriptions' ? 'active' : '' }}">
-        {!! link_to_route('projects.subscriptions', trans('project.subscriptions').' ('.$project->subscriptions->count().')', [$project->id]) !!}
+        {!! link_to_route('projects.subscriptions', __('project.subscriptions').' ('.$project->subscriptions->count().')', $project) !!}
     </li>
     @endcan
     @can('view-invoices', $project)
     <li class="{{ Request::segment(3) == 'invoices' ? 'active' : '' }}">
-        {!! link_to_route('projects.invoices', trans('project.invoices').' ('.$project->invoices->count().')', [$project->id]) !!}
+        {!! link_to_route('projects.invoices', __('project.invoices').' ('.$project->invoices->count().')', $project) !!}
     </li>
     @endcan
     @can('view-files', $project)
     <li class="{{ Request::segment(3) == 'files' ? 'active' : '' }}">
-        {!! link_to_route('projects.files', trans('project.files').' ('.$project->files->count().')', [$project->id]) !!}
+        {!! link_to_route('projects.files', __('project.files').' ('.$project->files->count().')', $project) !!}
     </li>
     @endcan
 </ul>
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index 8bfa94f..1ccbc30 100755
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -2,9 +2,9 @@
 
 @section('action-buttons')
 @can('update', $project)
-    {!! link_to_route('projects.edit', trans('project.edit'), [$project->id], ['class' => 'btn btn-warning']) !!}
+    {!! link_to_route('projects.edit', __('project.edit'), $project, ['class' => 'btn btn-warning']) !!}
 @endcan
-{!! link_to_route('projects.index', trans('project.back_to_index'), ['status_id' => $project->status_id], ['class' => 'btn btn-default']) !!}
+{!! link_to_route('projects.index', __('project.back_to_index'), ['status_id' => $project->status_id], ['class' => 'btn btn-default']) !!}
 @endsection
 
 @section('content-project')
@@ -15,8 +15,8 @@
     </div>
     <div class="col-md-6">
         @can('update', $project)
-        {!! Form::model($project, ['route' => ['projects.status-update', $project->id], 'method' => 'patch','class' => 'well well-sm form-inline']) !!}
-        {!! FormField::select('status_id', ProjectStatus::toArray(), ['label' => trans('project.status')]) !!}
+        {!! Form::model($project, ['route' => ['projects.status-update', $project], 'method' => 'patch', 'class' => 'well well-sm form-inline']) !!}
+        {!! FormField::select('status_id', ProjectStatus::toArray(), ['label' => __('project.status')]) !!}
         {!! Form::submit(__('project.update_status'), ['class' => 'btn btn-info btn-sm']) !!}
         {!! Form::close() !!}
         @endcan