=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json	2014-04-18 15:05:20 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json	2014-05-22 10:22:11 +0000
@@ -29,7 +29,7 @@
     "done": "Done",
     "remove": "Remove",
     "are_you_sure_to_remove": "Are you sure you want to remove the selected item?",
-    "show_hide_columns": "Show/Hide columns",
+    "show_hide_columns": "Show/hide columns",
     "show_all": "Show all",
     "hide": "Hide",
     "select_columns_to_show": "Select columns to show",
@@ -37,7 +37,7 @@
     "new_event": "New Event",
     "data_element": "Data element",
     "value": "Value",
-    "register_new_event": "Register New Event",
+    "register_event": "Register event",
     "total_number_of_pages": "No. of pages",
     "rows_per_page": "No. of rows per page",
     "jump_to_page": "Jump to page",

=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/fr.json'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/fr.json	2014-04-15 10:43:39 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/fr.json	2014-05-22 10:22:11 +0000
@@ -37,7 +37,7 @@
     "new_event": "Nouvel événement",
     "data_element": "Élément de donnée",
     "value": "Valeur",
-    "register_new_event": "Enregistrer un nouvel événement",
+    "register_event": "Enregistrer événement",
     "total_number_of_pages": "Nb de pages",
     "rows_per_page": "Nb de lignes par page",
     "jump_to_page": "Aller à la page",

=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html	2014-05-22 09:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html	2014-05-22 10:22:11 +0000
@@ -171,7 +171,15 @@
                     <table>
                         <tr>
                             <td><label>{{'registering_unit'| translate}}</label></td>
-                            <td><input type="text" class="fixed-width-text" selected-org-unit ng-model="selectedOrgUnit.name" value="{{selectedOrgUnit.name || 'please_select'| translate}}" disabled=""></td>
+                            <td><input type="text" class="fixed-width-text" selected-org-unit ng-model="selectedOrgUnit.name" value="{{selectedOrgUnit.name || 'please_select'| translate}}" disabled="" style="height:14px"></td>
+                        	<td style='padding-left: 10px;'>
+                                <button class="button button-std"
+                                        ng-show="dhis2Events.length"
+                                        ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid"                                        
+                                        ng-click="showHideColumns()">
+                                    {{'show_hide_columns'| translate}}
+                                </button>  
+                            </td>
                         </tr>
                         <tr>
                             <td><label>{{'program'| translate}}</label></td>
@@ -187,21 +195,13 @@
                                 </select>      
                             </td>
                             <td style='padding-left: 10px;'>
-                                <button class="button"
+                                <button class="button button-std"
                                         ng-show="selectedProgramStage" 
                                         ng-click="showEventRegistration()" 
                                         ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid">
-                                    {{'register_new_event'| translate}}
-                                </button>  
-                            </td>
-                            <td style='padding-left: 8px;'>
-                                <button class="button"
-                                        ng-show="dhis2Events.length"
-                                        ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid"                                        
-                                        ng-click="showHideColumns()">
-                                    {{'show_hide_columns'| translate}}
-                                </button>  
-                            </td>
+                                    {{'register_event'| translate}}
+                                </button>  
+                            </td>                            
                         </tr>                       
                     </table>
                 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css	2014-05-12 13:22:30 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css	2014-05-22 10:22:11 +0000
@@ -85,6 +85,7 @@
     padding-bottom: 20px;
     margin-bottom: 20px;
 }
+
 .black {
     color: black;
 }
@@ -225,6 +226,10 @@
     font-weight: bold;
 }
 
+.button-std {
+	width: 130px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Bootstrap modal style
 /*----------------------------------------------------------------------------*/