diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php
index 3bf3254b8..b4f34ee11 100644
--- a/app/Http/Controllers/Wizard/Companies.php
+++ b/app/Http/Controllers/Wizard/Companies.php
@@ -78,21 +78,4 @@ class Companies extends Controller
 
         return redirect('wizard/currencies');
     }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  Request  $request
-     *
-     * @return Response
-     */
-    public function skip()
-    {
-        setting()->set('general.wizard', true);
-
-        // Save all settings
-        setting()->save();
-
-        return redirect('/');
-    }
 }
diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php
index f69c210a2..bd4a06b35 100644
--- a/app/Http/Controllers/Wizard/Currencies.php
+++ b/app/Http/Controllers/Wizard/Currencies.php
@@ -16,7 +16,7 @@ class Currencies extends Controller
      *
      * @return Response
      */
-    public function edit()
+    public function index()
     {
         if (setting('general.wizard', false)) {
             return redirect('/');
@@ -24,7 +24,30 @@ class Currencies extends Controller
 
         $currencies = Currency::all();
 
-        return view('wizard.currencies.edit', compact('currencies'));
+        return view('wizard.currencies.index', compact('currencies'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  Currency  $currency
+     *
+     * @return Response
+     */
+    public function edit(Currency $currency)
+    {
+        if (setting('general.wizard', false)) {
+            return redirect('/');
+        }
+
+        $html = view('wizard.currencies.edit', compact('currency'))->render();
+
+        return response()->json([
+            'success' => true,
+            'error' => false,
+            'message' => 'null',
+            'html' => $html,
+        ]);
     }
 
     /**
@@ -80,4 +103,117 @@ class Currencies extends Controller
             return redirect('settings/currencies/' . $currency->id . '/edit');
         }
     }
+
+    /**
+     * Enable the specified resource.
+     *
+     * @param  Currency  $currency
+     *
+     * @return Response
+     */
+    public function enable(Currency $currency)
+    {
+        $currency->enabled = 1;
+        $currency->save();
+
+        $message = trans('messages.success.enabled', ['type' => trans_choice('general.currencies', 1)]);
+
+        return response()->json([
+            'success' => true,
+            'error' => false,
+            'message' => $message,
+            'data' => $currency,
+        ]);
+    }
+
+    /**
+     * Disable the specified resource.
+     *
+     * @param  Currency  $currency
+     *
+     * @return Response
+     */
+    public function disable(Currency $currency)
+    {
+        $relationships = $this->countRelationships($currency, [
+            'accounts' => 'accounts',
+            'customers' => 'customers',
+            'invoices' => 'invoices',
+            'revenues' => 'revenues',
+            'bills' => 'bills',
+            'payments' => 'payments',
+        ]);
+
+        if ($currency->code == setting('general.default_currency')) {
+            $relationships[] = strtolower(trans_choice('general.companies', 1));
+        }
+
+        if (empty($relationships)) {
+            $currency->enabled = 0;
+            $currency->save();
+
+            $message = trans('messages.success.disabled', ['type' => trans_choice('general.currencies', 1)]);
+
+            return response()->json([
+                'success' => true,
+                'error' => false,
+                'message' => $message,
+                'data' => $currency,
+            ]);
+        } else {
+            $message = trans('messages.warning.disabled', ['name' => $currency->name, 'text' => implode(', ', $relationships)]);
+
+            return response()->json([
+                'success' => false,
+                'error' => true,
+                'message' => $message,
+                'data' => $currency,
+            ]);
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  Currency  $currency
+     *
+     * @return Response
+     */
+    public function destroy(Currency $currency)
+    {
+        $relationships = $this->countRelationships($currency, [
+            'accounts' => 'accounts',
+            'customers' => 'customers',
+            'invoices' => 'invoices',
+            'revenues' => 'revenues',
+            'bills' => 'bills',
+            'payments' => 'payments',
+        ]);
+
+        if ($currency->code == setting('general.default_currency')) {
+            $relationships[] = strtolower(trans_choice('general.companies', 1));
+        }
+
+        if (empty($relationships)) {
+            $currency->delete();
+
+            $message = trans('messages.success.deleted', ['type' => trans_choice('general.currencies', 1)]);
+
+            return response()->json([
+                'success' => true,
+                'error' => false,
+                'message' => $message,
+                'data' => $currency,
+            ]);
+        } else {
+            $message = trans('messages.warning.deleted', ['name' => $currency->name, 'text' => implode(', ', $relationships)]);
+
+            return response()->json([
+                'success' => false,
+                'error' => true,
+                'message' => $message,
+                'data' => $currency,
+            ]);
+        }
+    }
 }
diff --git a/app/Http/Controllers/Wizard/Finish.php b/app/Http/Controllers/Wizard/Finish.php
index 3f1d73d1f..25a9727fb 100644
--- a/app/Http/Controllers/Wizard/Finish.php
+++ b/app/Http/Controllers/Wizard/Finish.php
@@ -3,10 +3,13 @@
 namespace App\Http\Controllers\Wizard;
 
 use Illuminate\Routing\Controller;
-use App\Models\Common\Company;
+use App\Traits\Modules;
+use App\Models\Module\Module;
 
 class Finish extends Controller
 {
+    use Modules;
+
     /**
      * Show the form for creating a new resource.
      *
@@ -23,6 +26,14 @@ class Finish extends Controller
         // Save all settings
         setting()->save();
 
-        return view('wizard.finish.index', compact(''));
+        $data = [
+            'query' => [
+                'limit' => 4
+            ]
+        ];
+
+        $modules = $this->getFeaturedModules($data);
+
+        return view('wizard.finish.index', compact('modules'));
     }
 }
diff --git a/app/Http/Controllers/Wizard/Taxes.php b/app/Http/Controllers/Wizard/Taxes.php
index d567a3f6c..86dd44d88 100644
--- a/app/Http/Controllers/Wizard/Taxes.php
+++ b/app/Http/Controllers/Wizard/Taxes.php
@@ -15,7 +15,25 @@ class Taxes extends Controller
      *
      * @return Response
      */
-    public function edit()
+    public function index()
+    {
+        if (setting(setting('general.wizard', false))) {
+            return redirect('/');
+        }
+
+        $taxes = Tax::all();
+
+        return view('wizard.taxes.index', compact('taxes'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  Tax  $tax
+     *
+     * @return Response
+     */
+    public function edit(Tax $tax)
     {
         if (setting(setting('general.wizard', false))) {
             return redirect('/');
@@ -58,4 +76,103 @@ class Taxes extends Controller
             return redirect('settings/taxes/' . $tax->id . '/edit');
         }
     }
+
+    /**
+     * Enable the specified resource.
+     *
+     * @param  Tax  $tax
+     *
+     * @return Response
+     */
+    public function enable(Tax $tax)
+    {
+        $tax->enabled = 1;
+        $tax->save();
+
+        $message = trans('messages.success.enabled', ['type' => trans_choice('general.tax_rates', 1)]);
+
+        return response()->json([
+            'success' => true,
+            'error' => false,
+            'message' => $message,
+            'data' => $tax,
+        ]);
+    }
+
+    /**
+     * Disable the specified resource.
+     *
+     * @param  Tax  $tax
+     *
+     * @return Response
+     */
+    public function disable(Tax $tax)
+    {
+        $relationships = $this->countRelationships($tax, [
+            'items' => 'items',
+            'invoice_items' => 'invoices',
+            'bill_items' => 'bills',
+        ]);
+
+        if (empty($relationships)) {
+            $tax->enabled = 0;
+            $tax->save();
+
+            $message = trans('messages.success.disabled', ['type' => trans_choice('general.tax_rates', 1)]);
+
+            return response()->json([
+                'success' => true,
+                'error' => false,
+                'message' => $message,
+                'data' => $tax,
+            ]);
+        } else {
+            $message = trans('messages.warning.disabled', ['name' => $tax->name, 'text' => implode(', ', $relationships)]);
+
+            return response()->json([
+                'success' => false,
+                'error' => true,
+                'message' => $message,
+                'data' => $tax,
+            ]);
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  Tax  $tax
+     *
+     * @return Response
+     */
+    public function destroy(Tax $tax)
+    {
+        $relationships = $this->countRelationships($tax, [
+            'items' => 'items',
+            'invoice_items' => 'invoices',
+            'bill_items' => 'bills',
+        ]);
+
+        if (empty($relationships)) {
+            $tax->delete();
+
+            $message = trans('messages.success.deleted', ['type' => trans_choice('general.taxes', 1)]);
+
+            return response()->json([
+                'success' => true,
+                'error' => false,
+                'message' => $message,
+                'data' => $tax,
+            ]);
+        } else {
+            $message = trans('messages.warning.deleted', ['name' => $tax->name, 'text' => implode(', ', $relationships)]);
+
+            return response()->json([
+                'success' => false,
+                'error' => true,
+                'message' => $message,
+                'data' => $tax,
+            ]);
+        }
+    }
 }
diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php
index 5076ecf1c..977c2a49f 100644
--- a/app/Traits/Modules.php
+++ b/app/Traits/Modules.php
@@ -200,6 +200,17 @@ trait Modules
         return [];
     }
 
+    public function getFeaturedModules($data = [])
+    {
+        $response = $this->getRemote('apps/featured', 'GET', $data);
+
+        if ($response && ($response->getStatusCode() == 200)) {
+            return json_decode($response->getBody())->data;
+        }
+
+        return [];
+    }
+
     public function getCoreVersion()
     {
         $data['query'] = Info::all();
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index ab1ca05b3..3459271b0 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -109,6 +109,7 @@ return [
     'disable'               => 'Disable',
     'select_all'            => 'Select All',
     'unselect_all'          => 'Unselect All',
+    'go_to'                 => 'Go to :name',
     'title' => [
         'new'               => 'New :type',
         'edit'              => 'Edit :type',
diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php
index 80a0bbd44..3a2a9a373 100644
--- a/resources/lang/en-GB/modules.php
+++ b/resources/lang/en-GB/modules.php
@@ -16,6 +16,8 @@ return [
     'no_apps'               => 'There are no apps in this category, yet.',
     'developer'             => 'Are you a developer? <a href="https://akaunting.com/blog/akaunting-app-store" target="_blank">Here</a> you can learn how to create an app and start selling today!',
 
+    'recommended_apps'      => 'Recommended Apps',
+
     'about'                 => 'About',
 
     'added'                 => 'Added',
diff --git a/resources/views/layouts/wizard.blade.php b/resources/views/layouts/wizard.blade.php
index 39bb46c2d..3249fe754 100644
--- a/resources/views/layouts/wizard.blade.php
+++ b/resources/views/layouts/wizard.blade.php
@@ -6,11 +6,7 @@
 
         <!-- Site wrapper -->
         <div class="wrapper">
-            @include('partials.wizard.header')
-
             @include('partials.wizard.content')
-
-            @include('partials.wizard.footer')
         </div>
 
         @stack('body_end')
diff --git a/resources/views/partials/wizard/footer.blade.php b/resources/views/partials/wizard/footer.blade.php
deleted file mode 100644
index 91daf239b..000000000
--- a/resources/views/partials/wizard/footer.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@stack('footer_start')
-
-<footer class="main-footer no-margin">
-    <div class="pull-right hidden-xs">
-        <b>{{ trans('footer.version') }}</b> {{ version('short') }}
-    </div>
-    <strong>{{ trans('footer.powered') }}</strong>: <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
-</footer>
-
-@stack('footer_end')
diff --git a/resources/views/partials/wizard/header.blade.php b/resources/views/partials/wizard/header.blade.php
deleted file mode 100644
index b31d72258..000000000
--- a/resources/views/partials/wizard/header.blade.php
+++ /dev/null
@@ -1,85 +0,0 @@
-@stack('header_start')
-
-<header class="main-header">
-    <!-- Logo -->
-    <a href="{{ url('/') }}" class="logo">
-        @if (setting('general.admin_theme', 'skin-green-light') == 'skin-green-light')
-            <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><img src="{{ asset('public/img/akaunting-logo-white.png') }}" class="logo-image-mini" width="25" alt="Akaunting Logo"></span>
-            <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><img src="{{ asset('public/img/akaunting-logo-white.png') }}" class="logo-image-lg" width="25" alt="Akaunting Logo"> <b>Akaunting</b></span>
-        @else
-            <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><img src="{{ asset('public/img/akaunting-logo-green.png') }}" class="logo-image-mini" width="25" alt="Akaunting Logo"></span>
-            <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><img src="{{ asset('public/img/akaunting-logo-green.png') }}" class="logo-image-lg" width="25" alt="Akaunting Logo"> <b>Akaunting</b></span>
-        @endif
-    </a>
-    <!-- Header Navbar: style can be found in header.less -->
-    <nav class="navbar navbar-static-top">
-        @stack('header_navbar_left')
-
-        <div class="navbar-custom-menu">
-            <ul class="nav navbar-nav">
-                @stack('header_navbar_right')
-
-                <!-- Updates: style can be found in dropdown.less -->
-                <li class="hidden-xs">
-                    <a href="{{ url(trans('header.docs_link')) }}" target="_blank" title="{{ trans('general.help') }}">
-                        <i class="fa fa-life-ring"></i>
-                    </a>
-                </li>
-                <!-- User Account: style can be found in dropdown.less -->
-                <li class="dropdown user user-menu">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        @if ($user->picture)
-                            @if (setting('general.use_gravatar', '0') == '1')
-                                <img src="{{ $user->picture }}" class="user-image" alt="User Image">
-                            @else
-                                <img src="{{ Storage::url($user->picture->id) }}" class="user-image" alt="User Image">
-                            @endif
-                        @else
-                            <i class="fa fa-user-o"></i>
-                        @endif
-                        @if (!empty($user->name))
-                            <span class="hidden-xs">{{ $user->name }}</span>
-                        @endif
-                    </a>
-                    <ul class="dropdown-menu">
-                        <!-- User image -->
-                        <li class="user-header">
-                            @if ($user->picture)
-                                @if (setting('general.use_gravatar', '0') == '1')
-                                    <img src="{{ $user->picture }}" class="img-circle" alt="User Image">
-                                @else
-                                    <img src="{{ Storage::url($user->picture->id) }}" class="img-circle" alt="User Image">
-                                @endif
-                            @else
-                                <i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
-                            @endif
-                            <p>
-                                @if (!empty($user->name))
-                                {{ $user->name }}
-                                @endif
-                                <small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small>
-                            </p>
-                        </li>
-                        <!-- Menu Footer-->
-                        <li class="user-footer">
-                            @permission('read-auth-profile')
-                            <div class="pull-left">
-                                <a href="{{ url('auth/users/' . $user->id . '/edit') }}" class="btn btn-default btn-flat">{{ trans('auth.profile') }}</a>
-                            </div>
-                            @endpermission
-                            <div class="pull-right">
-                                <a href="{{ url('auth/logout') }}" class="btn btn-default btn-flat">{{ trans('auth.logout') }}</a>
-                            </div>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-    </nav>
-</header>
-
-@stack('header_end')
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index d2fa4a0af..7ef0812d5 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -67,7 +67,7 @@
         <div class="col-md-12">
             <div class="form-group no-margin">
                 {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success  button-submit', 'data-loading-text' => trans('general.loading')]) !!}
-                <a href="{{ url('wizard/skip') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+                <a href="{{ url('wizard/currencies') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
             </div>
         </div>
     </div>
diff --git a/resources/views/wizard/currencies/edit.blade.php b/resources/views/wizard/currencies/edit.blade.php
index defec5157..1a7343eca 100644
--- a/resources/views/wizard/currencies/edit.blade.php
+++ b/resources/views/wizard/currencies/edit.blade.php
@@ -1,116 +1,38 @@
-@extends('layouts.wizard')
-
-@section('title', trans('general.wizard'))
-
-@section('content')
-<!-- Default box -->
-<div class="box box-solid">
-    <div class="box-body">
-        <div class="stepwizard">
-            <div class="stepwizard-row setup-panel">
-                <div class="stepwizard-step col-xs-3">
-                    <a href="{{ url('wizard/companies') }}" type="button" class="btn btn-default btn-circle">1</a>
-                    <p><small>{{ trans_choice('general.companies', 1) }}</small></p>
-                </div>
-                <div class="stepwizard-step col-xs-3">
-                    <a href="#step-2" type="button" class="btn btn-success btn-circle">2</a>
-                    <p><small>{{ trans_choice('general.currencies', 2) }}</small></p>
-                </div>
-                <div class="stepwizard-step col-xs-3">
-                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">3</button>
-                    <p><small>{{ trans_choice('general.taxes', 2) }}</small></p>
-                </div>
-                <div class="stepwizard-step col-xs-3">
-                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">4</button>
-                    <p><small>{{ trans_choice('general.finish', 1) }}</small></p>
-                </div>
-            </div>
+<tr>
+    <td><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/edit') }}" class="currency-edit">{{ $item->name }}</a></td>
+    <td class="hidden-xs">{{ $item->code }}</td>
+    <td>{{ $item->rate }}</td>
+    <td class="hidden-xs">
+        @if ($item->enabled)
+            <span class="label label-success">{{ trans('general.enabled') }}</span>
+        @else
+            <span class="label label-danger">{{ trans('general.disabled') }}</span>
+        @endif
+    </td>
+    <td class="text-center">
+        <div class="btn-group">
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">
+                <i class="fa fa-ellipsis-h"></i>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-right">
+                <li><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/edit') }}" class="currency-edit">{{ trans('general.edit') }}</a></li>
+                @if ($item->enabled)
+                    <li><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/disable') }}" class="currency-disable">{{ trans('general.disable') }}</a></li>
+                @else
+                    <li><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/enable') }}" class="currency-enable">{{ trans('general.enable') }}</a></li>
+                @endif
+                @permission('delete-settings-currencies')
+                <li class="divider"></li>
+                <li>
+                    {!! Form::button(trans('general.delete'), array(
+                        'type'    => 'button',
+                        'class'   => 'delete-link',
+                        'title'   => trans('general.delete'),
+                        'onclick' => 'confirmDelete("' . '#currencies-' . $item->id . '", "' . trans_choice('general.currencies', 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->name . '</strong>', 'type' => mb_strtolower(trans_choice('general.currencies', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
+                    )) !!}
+                </li>
+                @endpermission
+            </ul>
         </div>
-    </div>
-</div>
-
-<div class="box box-success">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{ trans_choice('general.currencies', 1) }}</h3>
-    </div>
-    <!-- /.box-header -->
-
-    <div class="box-body">
-        <div class="table table-responsive">
-            <table class="table table-striped table-hover" id="tbl-currencies">
-                <thead>
-                <tr>
-                    <th class="col-md-5">@sortablelink('name', trans('general.name'))</th>
-                    <th class="col-md-3 hidden-xs">@sortablelink('code', trans('currencies.code'))</th>
-                    <th class="col-md-2">@sortablelink('rate', trans('currencies.rate'))</th>
-                    <th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
-                    <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($currencies as $item)
-                    <tr>
-                        <td><a href="{{ url('settings/currencies/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
-                        <td class="hidden-xs">{{ $item->code }}</td>
-                        <td>{{ $item->rate }}</td>
-                        <td class="hidden-xs">
-                            @if ($item->enabled)
-                                <span class="label label-success">{{ trans('general.enabled') }}</span>
-                            @else
-                                <span class="label label-danger">{{ trans('general.disabled') }}</span>
-                            @endif
-                        </td>
-                        <td class="text-center">
-                            <div class="btn-group">
-                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">
-                                    <i class="fa fa-ellipsis-h"></i>
-                                </button>
-                                <ul class="dropdown-menu dropdown-menu-right">
-                                    <li><a href="{{ url('settings/currencies/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
-                                    @if ($item->enabled)
-                                        <li><a href="{{ route('currencies.disable', $item->id) }}">{{ trans('general.disable') }}</a></li>
-                                    @else
-                                        <li><a href="{{ route('currencies.enable', $item->id) }}">{{ trans('general.enable') }}</a></li>
-                                    @endif
-                                    @permission('delete-settings-currencies')
-                                    <li class="divider"></li>
-                                    <li>{!! Form::deleteLink($item, 'settings/currencies') !!}</li>
-                                    @endpermission
-                                </ul>
-                            </div>
-                        </td>
-                    </tr>
-                @endforeach
-                <tr id="add-new">
-                    <td colspan="5" class="text-right">
-                        <span class="new-button"><a href="{{ url('settings/currencies/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <!-- /.box-body -->
-
-    <div class="box-footer">
-        <div class="col-md-12">
-            <div class="form-group no-margin">
-                {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success  button-submit', 'data-loading-text' => trans('general.loading')]) !!}
-                <a href="{{ url('wizard/skip') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
-            </div>
-        </div>
-    </div>
-    <!-- /.box-footer -->
-</div>
-@endsection
-
-@push('scripts')
-<script type="text/javascript">
-    var text_yes = '{{ trans('general.yes') }}';
-    var text_no = '{{ trans('general.no') }}';
-
-    $(document).ready(function() {
-
-    });
-</script>
-@endpush
+    </td>
+</tr>
\ No newline at end of file
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
new file mode 100644
index 000000000..ad76cc1e5
--- /dev/null
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -0,0 +1,206 @@
+@extends('layouts.wizard')
+
+@section('title', trans('general.wizard'))
+
+@section('content')
+<!-- Default box -->
+<div class="box box-solid">
+    <div class="box-body">
+        <div class="stepwizard">
+            <div class="stepwizard-row setup-panel">
+                <div class="stepwizard-step col-xs-3">
+                    <a href="{{ url('wizard/companies') }}" type="button" class="btn btn-default btn-circle">1</a>
+                    <p><small>{{ trans_choice('general.companies', 1) }}</small></p>
+                </div>
+                <div class="stepwizard-step col-xs-3">
+                    <a href="#step-2" type="button" class="btn btn-success btn-circle">2</a>
+                    <p><small>{{ trans_choice('general.currencies', 2) }}</small></p>
+                </div>
+                <div class="stepwizard-step col-xs-3">
+                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">3</button>
+                    <p><small>{{ trans_choice('general.taxes', 2) }}</small></p>
+                </div>
+                <div class="stepwizard-step col-xs-3">
+                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">4</button>
+                    <p><small>{{ trans_choice('general.finish', 1) }}</small></p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="box box-success">
+    <div class="box-header with-border">
+        <h3 class="box-title">{{ trans_choice('general.currencies', 1) }}</h3>
+        <span class="new-button"><a href="{{ url('settings/currencies/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
+    </div>
+    <!-- /.box-header -->
+
+    <div class="box-body">
+        <div class="table table-responsive">
+            <table class="table table-striped table-hover" id="tbl-currencies">
+                <thead>
+                <tr>
+                    <th class="col-md-5">@sortablelink('name', trans('general.name'))</th>
+                    <th class="col-md-3 hidden-xs">@sortablelink('code', trans('currencies.code'))</th>
+                    <th class="col-md-2">@sortablelink('rate', trans('currencies.rate'))</th>
+                    <th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
+                    <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($currencies as $item)
+                    <tr id="currency-{{ $item->id }}" data-href="{{ url('wizard/currencies/' . $item->id . '/delete') }}">
+                        <td class="currency-name"><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/edit') }}" class="currency-edit">{{ $item->name }}</a></td>
+                        <td class="currency-code hidden-xs">{{ $item->code }}</td>
+                        <td class="currency-rate">{{ $item->rate }}</td>
+                        <td class="currency-status hidden-xs">
+                            @if ($item->enabled)
+                                <span class="label label-success">{{ trans('general.enabled') }}</span>
+                            @else
+                                <span class="label label-danger">{{ trans('general.disabled') }}</span>
+                            @endif
+                        </td>
+                        <td class="currency-action text-center">
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">
+                                    <i class="fa fa-ellipsis-h"></i>
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right">
+                                    <li><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/edit') }}" class="currency-edit">{{ trans('general.edit') }}</a></li>
+                                    @if ($item->enabled)
+                                        <li><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/disable') }}" class="currency-disable">{{ trans('general.disable') }}</a></li>
+                                    @else
+                                        <li><a href="javascript:void(0);" data-href="{{ url('wizard/currencies/' . $item->id . '/enable') }}" class="currency-enable">{{ trans('general.enable') }}</a></li>
+                                    @endif
+                                    @permission('delete-settings-currencies')
+                                    <li class="divider"></li>
+                                    <li>
+                                        {!! Form::button(trans('general.delete'), array(
+                                            'type'    => 'button',
+                                            'class'   => 'delete-link',
+                                            'title'   => trans('general.delete'),
+                                            'onclick' => 'confirmCurrency("' . '#currency-' . $item->id . '", "' . trans_choice('general.currencies', 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->name . '</strong>', 'type' => mb_strtolower(trans_choice('general.currencies', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
+                                        )) !!}
+                                    </li>
+                                    @endpermission
+                                </ul>
+                            </div>
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <!-- /.box-body -->
+
+    <div class="box-footer">
+        <div class="col-md-12">
+            <div class="form-group no-margin">
+                <a href="{{ url('wizard/taxes') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+            </div>
+        </div>
+    </div>
+    <!-- /.box-footer -->
+</div>
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    $(document).on('click', '.currency-edit', function (e) {
+        data_href = $(this).data('href');
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    $('body').append(json['html']);
+                }
+            }
+        });
+    });
+
+    $(document).on('click', '.currency-disable', function (e) {
+        data_href = $(this).data('href');
+
+        currency_tr = $(this).parent().parent().parent().parent().parent();
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    currency_tr.find('.currency-status').html('<span class="label label-danger">{{ trans('general.disabled') }}</span>');
+                }
+            }
+        });
+    });
+
+    $(document).on('click', '.currency-enable', function (e) {
+        data_href = $(this).data('href');
+
+        currency_tr = $(this).parent().parent().parent().parent().parent();
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    currency_tr.find('.currency-status').html('<span class="label label-success">{{ trans('general.enabled') }}</span>');
+                }
+            }
+        });
+    });
+
+    function confirmCurrency(tr_id, title, message, button_cancel, button_delete) {
+        $('#confirm-modal').remove();
+
+        var html  = '';
+
+        html += '<div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalLabel" aria-hidden="true">';
+        html += '  <div class="modal-dialog">';
+        html += '      <div class="modal-content">';
+        html += '          <div class="modal-header">';
+        html += '              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>';
+        html += '              <h4 class="modal-title" id="confirmModalLabel">' + title + '</h4>';
+        html += '          </div>';
+        html += '          <div class="modal-body">';
+        html += '              <p>' + message + '</p>';
+        html += '              <p></p>';
+        html += '          </div>';
+        html += '          <div class="modal-footer">';
+        html += '              <div class="pull-left">';
+        html += '                  <button type="button" class="btn btn-danger" onclick="deleteCurrency(\'' + tr_id + '\');">' + button_delete + '</button>';
+        html += '                  <button type="button" class="btn btn-default" data-dismiss="modal">' + button_cancel + '</button>';
+        html += '              </div>';
+        html += '          </div>';
+        html += '      </div>';
+        html += '  </div>';
+        html += '</div>';
+
+        $('body').append(html);
+
+        $('#confirm-modal').modal('show');
+    }
+
+    function deleteCurrency(tr_id) {
+        data_href = $(tr_id).data('href');
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    $(tr_id).remove();
+                }
+            }
+        });
+    }
+</script>
+@endpush
diff --git a/resources/views/wizard/finish/index.blade.php b/resources/views/wizard/finish/index.blade.php
index 0f7947512..fc3e9a26b 100644
--- a/resources/views/wizard/finish/index.blade.php
+++ b/resources/views/wizard/finish/index.blade.php
@@ -29,11 +29,53 @@
     </div>
 </div>
 
-<div class="box box-success">
+<div class="row" style="margin-top: 50px;">
+    <div class="col-md-12 no-padding-right text-center">
+        <a href="{{ url('/') }}" class="btn btn-lg btn-success"><span class="fa fa-dashboard"></span> &nbsp;{{ trans('general.go_to', ['name' => trans('general.dashboard')]) }}</a>
+    </div>
+</div>
 
+<div class="row">
+    <div class="col-md-12 no-padding-right">
+        <div class="content-header no-padding-left">
+            <h3>{{ trans('modules.recommended_apps') }}</h3>
+        </div>
+
+        @if ($modules)
+            @foreach ($modules->data as $module)
+                @include('partials.modules.item')
+            @endforeach
+            <div class="col-md-12 no-padding-left">
+                <ul class="pager nomargin">
+                    @if ($modules->current_page < $modules->last_page)
+                        <li class="next"><a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-default btn-sm">{{ trans('pagination.next') }}</a></li>
+                    @endif
+                    @if ($modules->current_page > 1)
+                        <li class="previous"><a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-default btn-sm">{{ trans('pagination.previous') }}</a></li>
+                    @endif
+                </ul>
+            </div>
+        @else
+            <div class="box box-success">
+                <div class="box-body">
+                    <p class="col-md-12" style="margin-top: 15px">
+                        {{ trans('modules.no_apps') }}
+                    </p>
+                    <p class="col-md-12" style="margin-top: 20px">
+                        <small>{!! trans('modules.developer') !!}</small>
+                    </p>
+                </div>
+                <!-- /.box-body -->
+            </div>
+        @endif
+    </div>
 </div>
 @endsection
 
+@push('css')
+<link rel="stylesheet" href="{{ asset('public/css/modules.css?v=' . version('short')) }}">
+@endpush
+
 @push('scripts')
 <script type="text/javascript">
     var text_yes = '{{ trans('general.yes') }}';
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
new file mode 100644
index 000000000..62cd768e7
--- /dev/null
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -0,0 +1,205 @@
+@extends('layouts.wizard')
+
+@section('title', trans('general.wizard'))
+
+@section('content')
+<!-- Default box -->
+<div class="box box-solid">
+    <div class="box-body">
+        <div class="stepwizard">
+            <div class="stepwizard-row setup-panel">
+                <div class="stepwizard-step col-xs-3">
+                    <a href="{{ url('wizard/companies') }}" type="button" class="btn btn-default btn-circle">1</a>
+                    <p><small>{{ trans_choice('general.companies', 1) }}</small></p>
+                </div>
+                <div class="stepwizard-step col-xs-3">
+                    <a href="{{ url('wizard/currencies') }}" type="button" class="btn btn-default btn-circle">2</a>
+                    <p><small>{{ trans_choice('general.currencies', 2) }}</small></p>
+                </div>
+                <div class="stepwizard-step col-xs-3">
+                    <a href="#step-3" type="button" class="btn btn-success btn-circle">3</a>
+                    <p><small>{{ trans_choice('general.taxes', 2) }}</small></p>
+                </div>
+                <div class="stepwizard-step col-xs-3">
+                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">4</button>
+                    <p><small>{{ trans_choice('general.finish', 1) }}</small></p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="box box-success">
+    <div class="box-header with-border">
+        <h3 class="box-title">{{ trans_choice('general.taxes', 1) }}</h3>
+        <span class="new-button"><a href="{{ url('settings/taxes/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
+    </div>
+    <!-- /.box-header -->
+
+    <div class="box-body">
+        <div class="table table-responsive">
+            <table class="table table-striped table-hover" id="tbl-taxes">
+                <thead>
+                <tr>
+                    <th class="col-md-5">@sortablelink('name', trans('general.name'))</th>
+                    <th class="col-md-5">@sortablelink('rate', trans('taxes.rate_percent'))</th>
+                    <th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
+                    <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($taxes as $item)
+                    <tr id="tax-{{ $item->id }}" data-href="{{ url('wizard/taxes/' . $item->id . '/delete') }}">
+                        <td class="tax-name"><a href="javascript:void(0);" data-href="{{ url('wizard/taxes/' . $item->id . '/edit') }}" class="tax-edit">{{ $item->name }}</a></td>
+                        <td class="tax-rate">{{ $item->rate }}</td>
+                        <td class="tax-status hidden-xs">
+                            @if ($item->enabled)
+                                <span class="label label-success">{{ trans('general.enabled') }}</span>
+                            @else
+                                <span class="label label-danger">{{ trans('general.disabled') }}</span>
+                            @endif
+                        </td>
+                        <td class="tax-action text-center">
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">
+                                    <i class="fa fa-ellipsis-h"></i>
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right">
+                                    <li><a href="javascript:void(0);" data-href="{{ url('wizard/taxes/' . $item->id . '/edit') }}" class="tax-edit">{{ trans('general.edit') }}</a></li>
+                                    @if ($item->enabled)
+                                        <li><a href="javascript:void(0);" data-href="{{ url('wizard/taxes/' . $item->id . '/disable') }}" class="tax-disable">{{ trans('general.disable') }}</a></li>
+                                    @else
+                                        <li><a href="javascript:void(0);" data-href="{{ url('wizard/taxes/' . $item->id . '/enable') }}" class="tax-enable">{{ trans('general.enable') }}</a></li>
+                                    @endif
+                                    @permission('delete-settings-taxes')
+                                    <li class="divider"></li>
+                                    <li>
+                                        {!! Form::button(trans('general.delete'), array(
+                                            'type'    => 'button',
+                                            'class'   => 'delete-link',
+                                            'title'   => trans('general.delete'),
+                                            'onclick' => 'confirmTax("' . '#tax-' . $item->id . '", "' . trans_choice('general.taxes', 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->name . '</strong>', 'type' => mb_strtolower(trans_choice('general.taxes', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
+                                        )) !!}
+                                    </li>
+                                    @endpermission
+                                </ul>
+                            </div>
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <!-- /.box-body -->
+
+    <div class="box-footer">
+        <div class="col-md-12">
+            <div class="form-group no-margin">
+                <a href="{{ url('wizard/finish') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+            </div>
+        </div>
+    </div>
+    <!-- /.box-footer -->
+
+</div>
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    $(document).on('click', '.tax-edit', function (e) {
+        data_href = $(this).data('href');
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    $('body').append(json['html']);
+                }
+            }
+        });
+    });
+
+    $(document).on('click', '.tax-disable', function (e) {
+        data_href = $(this).data('href');
+
+        tax_tr = $(this).parent().parent().parent().parent().parent();
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    tax_tr.find('.tax-status').html('<span class="label label-danger">{{ trans('general.disabled') }}</span>');
+                }
+            }
+        });
+    });
+
+    $(document).on('click', '.tax-enable', function (e) {
+        data_href = $(this).data('href');
+
+        tax_tr = $(this).parent().parent().parent().parent().parent();
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    tax_tr.find('.tax-status').html('<span class="label label-success">{{ trans('general.enabled') }}</span>');
+                }
+            }
+        });
+    });
+
+    function confirmTax(tr_id, title, message, button_cancel, button_delete) {
+        $('#confirm-modal').remove();
+
+        var html  = '';
+
+        html += '<div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalLabel" aria-hidden="true">';
+        html += '  <div class="modal-dialog">';
+        html += '      <div class="modal-content">';
+        html += '          <div class="modal-header">';
+        html += '              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>';
+        html += '              <h4 class="modal-title" id="confirmModalLabel">' + title + '</h4>';
+        html += '          </div>';
+        html += '          <div class="modal-body">';
+        html += '              <p>' + message + '</p>';
+        html += '              <p></p>';
+        html += '          </div>';
+        html += '          <div class="modal-footer">';
+        html += '              <div class="pull-left">';
+        html += '                  <button type="button" class="btn btn-danger" onclick="deleteTax(\'' + tr_id + '\');">' + button_delete + '</button>';
+        html += '                  <button type="button" class="btn btn-default" data-dismiss="modal">' + button_cancel + '</button>';
+        html += '              </div>';
+        html += '          </div>';
+        html += '      </div>';
+        html += '  </div>';
+        html += '</div>';
+
+        $('body').append(html);
+
+        $('#confirm-modal').modal('show');
+    }
+
+    function deleteTax(tr_id) {
+        data_href = $(tr_id).data('href');
+
+        $.ajax({
+            url: data_href,
+            type: 'GET',
+            dataType: 'JSON',
+            success: function(json) {
+                if (json['success']) {
+                    $(tr_id).remove();
+                }
+            }
+        });
+    }
+</script>
+@endpush
diff --git a/routes/web.php b/routes/web.php
index 9e67f631a..2a55780b8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -9,18 +9,25 @@ Route::group(['middleware' => 'language'], function () {
 
         Route::group(['middleware' => 'permission:read-admin-panel'], function () {
             Route::group(['prefix' => 'wizard'], function () {
-                Route::get('/', 'Wizard\Companies@edit');
-                Route::get('skip', 'Wizard\Companies@skip');
-                Route::get('companies', 'Wizard\Companies@edit');
-                Route::patch('companies', 'Wizard\Companies@update');
+                Route::get('/', 'Wizard\Companies@edit')->name('wizard.index');
+                Route::get('companies', 'Wizard\Companies@edit')->name('wizard.companies.edit');
+                Route::patch('companies', 'Wizard\Companies@update')->name('wizard.companies.update');
 
-                Route::get('currencies', 'Wizard\Currencies@edit');
-                Route::post('currencies', 'Wizard\Currencies@update');
+                Route::get('currencies', 'Wizard\Currencies@index')->name('wizard.currencies.index');
+                Route::get('currencies/{currency}/edit', 'Wizard\Currencies@edit')->name('wizard.currencies.edit');
+                Route::get('currencies/{currency}/enable', 'Wizard\Currencies@enable')->name('wizard.currencies.enable');
+                Route::get('currencies/{currency}/disable', 'Wizard\Currencies@disable')->name('wizard.currencies.disable');
+                Route::get('currencies/{currency}/delete', 'Wizard\Currencies@destroy')->name('wizard.currencies.delete');
+                Route::post('currencies/{currency}', 'Wizard\Currencies@update')->name('wizard.currencies.index');
 
-                Route::get('taxes', 'Wizard\Taxes@edit');
-                Route::post('taxes', 'Wizard\Taxes@update');
+                Route::get('taxes', 'Wizard\Taxes@index')->name('wizard.taxes.index');
+                Route::get('taxes/{tax}/edit', 'Wizard\Taxes@edit')->name('wizard.taxes.edit');
+                Route::get('taxes/{tax}/enable', 'Wizard\Taxes@enable')->name('wizard.taxes.enable');
+                Route::get('taxes/{tax}/disable', 'Wizard\Taxes@disable')->name('wizard.taxes.disable');
+                Route::get('taxes/{tax}/delete', 'Wizard\Taxes@destroy')->name('wizard.taxes.delete');
+                Route::post('taxes/{tax}', 'Wizard\Taxes@update')->name('wizard.taxes.index');
 
-                Route::get('finish', 'Wizard\Finish@index');
+                Route::get('finish', 'Wizard\Finish@index')->name('wizard.finish.index');
             });
         });