diff --git a/apimanager/accounts/templates/accounts/index.html b/apimanager/accounts/templates/accounts/index.html
index 9bc7027..9cc621f 100644
--- a/apimanager/accounts/templates/accounts/index.html
+++ b/apimanager/accounts/templates/accounts/index.html
@@ -95,7 +95,7 @@
             <div class="col-sm-12 hidden-xs">
                 <div class="form-group">
                     <button type="submit" class="btn btn-primary btn-green">
-                        {% trans "Add" %}
+                        {% trans "Create" %}
                     </button>
                 </div>
             </div>
diff --git a/apimanager/apicollectionlist/templates/apicollectionlist/apicollectionlist.html b/apimanager/apicollectionlist/templates/apicollectionlist/apicollectionlist.html
index 45be365..73233c6 100644
--- a/apimanager/apicollectionlist/templates/apicollectionlist/apicollectionlist.html
+++ b/apimanager/apicollectionlist/templates/apicollectionlist/apicollectionlist.html
@@ -35,7 +35,7 @@
                         </ul>
                     </div>
                 </td>
-                <td><a type= "button" class="btn btn-primary" href= "{{ url_collection_detail }}">{% trans "View" %}</a></td>
+                <td><a type= "button" class="btn btn-primary" href= "{{ url_collection_detail }}">{% trans "Detail" %}</a></td>
             </tr>
             {% endfor %}
             </tbody>
diff --git a/apimanager/atms/templates/atms/index.html b/apimanager/atms/templates/atms/index.html
index ef521a7..6185bd1 100644
--- a/apimanager/atms/templates/atms/index.html
+++ b/apimanager/atms/templates/atms/index.html
@@ -247,7 +247,7 @@
       <div class="col-sm-12 hidden-xs">
         <div class="form-group">
           <button type="submit" class="btn btn-primary btn-green">
-            {% trans "Add" %}
+            {% trans "Create" %}
           </button>
         </div>
       </div>
diff --git a/apimanager/banks/templates/banks/index.html b/apimanager/banks/templates/banks/index.html
index 525fc05..2a28220 100644
--- a/apimanager/banks/templates/banks/index.html
+++ b/apimanager/banks/templates/banks/index.html
@@ -89,7 +89,7 @@
   <div class="col-sm-12 hidden-xs">
     <div class="form-group">
       <button type="submit" class="btn btn-primary btn-green">
-        {% trans "Add" %}
+        {% trans "Create" %}
       </button>
     </div>
   </div>
diff --git a/apimanager/branches/templates/branches/index.html b/apimanager/branches/templates/branches/index.html
index 257f696..2e554c0 100644
--- a/apimanager/branches/templates/branches/index.html
+++ b/apimanager/branches/templates/branches/index.html
@@ -148,7 +148,7 @@
         <div class="row">
             <div class="col-sm-12 hidden-xs">
                 <div class="form-group">
-                    <button type="submit" class="btn btn-primary btn-green">{% trans "Add" %}</button>
+                    <button type="submit" class="btn btn-primary btn-green">{% trans "Create" %}</button>
                 </div>
             </div>
         </div>
diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html
index 12c8d7e..20bb14b 100644
--- a/apimanager/consumers/templates/consumers/index.html
+++ b/apimanager/consumers/templates/consumers/index.html
@@ -73,7 +73,7 @@
 					<form action="{% if consumer.enabled %}{% url 'consumers-disable' consumer.consumer_id %}{% else %}{% url 'consumers-enable' consumer.consumer_id %}{% endif %}?{{ request.GET.urlencode }}" method="post">
 						{% csrf_token %}
 						{% if consumer.enabled %}<button class="btn btn-primary btn-sm btn-red">{% trans "Disable" %}</button>{% else %}<button class="btn btn-primary btn-green btn-sm">{% trans "Enable" %}</button>{% endif %}
-							<a href="{{ url_detail }}" class="btn btn-primary btn-sm" role="button">{% trans "View" %}</a>
+							<a href="{{ url_detail }}" class="btn btn-primary btn-sm" role="button">{% trans "Detail" %}</a>
 					</form>
 				</td>
 			</tr>
diff --git a/apimanager/customerlist/templates/customerlist/customerlist.html b/apimanager/customerlist/templates/customerlist/customerlist.html
index 6ae61bf..0ce9871 100644
--- a/apimanager/customerlist/templates/customerlist/customerlist.html
+++ b/apimanager/customerlist/templates/customerlist/customerlist.html
@@ -33,7 +33,7 @@
                         </ul>
                     </div>
                 </td>
-                <td><a href="{{ url_customer_update }}" class="btn btn-primary">{% trans "View" %}</a></td>
+                <td><a href="{{ url_customer_update }}" class="btn btn-primary">{% trans "Detail" %}</a></td>
             </tr>
             {% endfor %}
             </tbody>
diff --git a/apimanager/customers/templates/customers/create.html b/apimanager/customers/templates/customers/create.html
index d3307a1..9a8d9c2 100644
--- a/apimanager/customers/templates/customers/create.html
+++ b/apimanager/customers/templates/customers/create.html
@@ -195,7 +195,7 @@
             </div>
         </div>
 
-        <input type="submit" value='{% trans "Create" %}' class="btn btn-primary" />
+        <input type="submit" value='{% trans "Create" %}' class="btn btn-primary btn-green" />
     </form>
 </div>
 {% endblock content %}
diff --git a/apimanager/productlist/templates/productlist/productlist.html b/apimanager/productlist/templates/productlist/productlist.html
index 4a76a1f..2007237 100644
--- a/apimanager/productlist/templates/productlist/productlist.html
+++ b/apimanager/productlist/templates/productlist/productlist.html
@@ -32,7 +32,7 @@
                         </ul>
                     </div>
                 </td>
-                <td><a href="{{ url_product_update }}" class="btn btn-primary">{% trans "View" %}</a></td>
+                <td><a href="{{ url_product_update }}" class="btn btn-primary">{% trans "Detail" %}</a></td>
             </tr>
             {% endfor %}
 
diff --git a/apimanager/products/templates/products/index.html b/apimanager/products/templates/products/index.html
index b7a082f..f468a5a 100644
--- a/apimanager/products/templates/products/index.html
+++ b/apimanager/products/templates/products/index.html
@@ -73,7 +73,7 @@
         <div class="row">
             <div class="col-sm-12 hidden-xs">
                 <div class="form-group">
-                    <button type="submit" class="btn btn-primary btn-green" onclick="createProductList()">{% trans "Add" %}</button>
+                    <button type="submit" class="btn btn-primary btn-green" onclick="createProductList()">{% trans "Create" %}</button>
                 </div>
             </div>
         </div>
diff --git a/apimanager/systemviews/templates/systemviews/index.html b/apimanager/systemviews/templates/systemviews/index.html
index ea97f4f..3431d71 100644
--- a/apimanager/systemviews/templates/systemviews/index.html
+++ b/apimanager/systemviews/templates/systemviews/index.html
@@ -17,7 +17,7 @@
         <td>{{ system_view.is_public }}</td>
         <td>{{ system_view.description }}</td>
 
-        <td><a href="{{ url_systemview_update }}" class="btn btn-primary">{% trans "View" %}</a></td>
+        <td><a href="{{ url_systemview_update }}" class="btn btn-primary">{% trans "Detail" %}</a></td>
       </tr>
       </tbody>
     </table>
diff --git a/apimanager/users/templates/users/index.html b/apimanager/users/templates/users/index.html
index 6fa2c27..a111e99 100644
--- a/apimanager/users/templates/users/index.html
+++ b/apimanager/users/templates/users/index.html
@@ -66,7 +66,7 @@
 					<td><a href="{{ url_users_detail }}">{{ user.user_id }}</td>
 					<td>{{ user.username }}</td>
 					<td>{{ user.email }}</td>
-					<td><a href="{{ url_users_detail }}" class="btn btn-primary">{% trans "View" %}</a></td>
+					<td><a href="{{ url_users_detail }}" class="btn btn-primary">{% trans "Detail" %}</a></td>
 				</tr>
 			{% endfor %}
 			</tbody>
diff --git a/apimanager/users/templates/users/invitation.html b/apimanager/users/templates/users/invitation.html
index 4c64ec7..efd4552 100644
--- a/apimanager/users/templates/users/invitation.html
+++ b/apimanager/users/templates/users/invitation.html
@@ -62,7 +62,7 @@
                 </div>
             </div>
 
-            <input type="submit" value='{% trans "Create" %}' class="btn btn-primary" />
+            <input type="submit" value='{% trans "Create" %}' class="btn btn-primary btn-green" />
             <div class="table-responsive">
                 <table class="table table-hover tablesorter" id="invitation-list" aria-describedby="invitation list">
                     <thead>