diff --git a/application/config/config.php b/application/config/config.php
index a864105..8e5fcfb 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -14,7 +14,7 @@
 | path to your installation.
 |
 */
-$config['base_url']	= 'http://localhost:8888/CodeIgniter-admin-panel';
+$config['base_url']	= '';
 
 /*
 |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@
 | variable so that it is blank.
 |
 */
-$config['index_page'] = '';
+$config['index_page'] = 'index.php';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/views/includes/footer.php b/application/views/includes/footer.php
index d12c754..0f99e89 100644
--- a/application/views/includes/footer.php
+++ b/application/views/includes/footer.php
@@ -8,8 +8,8 @@
 			</div>
 		</div>
 	</div>
-	<script src="<?php echo base_url(); ?>assets/js/jquery-1.7.1.min.js"></script>
-	<script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
-	<script src="<?php echo base_url(); ?>assets/js/admin.min.js"></script>
+	<script src="<?php echo site_url('assets/js/jquery-1.7.1.min.js');?>"></script>
+	<script src="<?php echo site_url('assets/js/bootstrap.min.js');?>"></script>
+	<script src="<?php echo site_url('assets/js/admin.min.js');?>"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index c6d8ecf..9359ab0 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -3,7 +3,7 @@
 <head>
   <title>CodeIgniter Admin Sample Project</title>
   <meta charset="utf-8">
-  <link href="<?php echo base_url(); ?>assets/css/admin/global.css" rel="stylesheet" type="text/css">
+  <link href="<?php echo site_url('assets/css/admin/global.css');?>" rel="stylesheet" type="text/css">
 </head>
 <body>
 	<div class="navbar navbar-fixed-top">
@@ -12,16 +12,16 @@
 	      <a class="brand">Project Name</a>
 	      <ul class="nav">
 	        <li <?php if($this->uri->segment(2) == 'products'){echo 'class="active"';}?>>
-	          <a href="<?php echo base_url(); ?>admin/products">Products</a>
+	          <a href="<?php echo site_url('admin/products');?>">Products</a>
 	        </li>
 	        <li <?php if($this->uri->segment(2) == 'manufacturers'){echo 'class="active"';}?>>
-	          <a href="<?php echo base_url(); ?>admin/manufacturers">Manufacturers</a>
+	          <a href="<?php echo site_url('admin/manufacturers');?>">Manufacturers</a>
 	        </li>
 	        <li class="dropdown">
 	          <a href="#" class="dropdown-toggle" data-toggle="dropdown">System <b class="caret"></b></a>
 	          <ul class="dropdown-menu">
 	            <li>
-	              <a href="<?php echo base_url(); ?>admin/logout">Logout</a>
+	              <a href="<?php echo site_url('admin/logout');?>">Logout</a>
 	            </li>
 	          </ul>
 	        </li>
