diff --git a/angular_app/event-tickets.html b/angular_app/event-tickets.html
index 62c0cb2..98abbb4 100644
--- a/angular_app/event-tickets.html
+++ b/angular_app/event-tickets.html
@@ -3,43 +3,32 @@
     <div eventman-message="eventman-message" control="message"></div>
     <div class="container">
         <div class="row">
-            <div class="col-md-7 col-xs-7 vcenter">
-                <h1>{{event.title}}
+            <div class="col-md-8">
+                <div class="panel panel-primary table-striped top5">
+                    <div class="panel-heading">
+                        <h1>{{event.title}} - {{'tickets' | translate}}
                     <button ng-if="event._id" ng-click="$state.go('event.edit', {id: event._id})" class="btn btn-success">
-                        <span class="fa fa-pencil-square-o vcenter"></span>
-                        {{'Edit' | translate}}
+                        <span class="fa fa-gear vcenter"></span>
+                        {{'Edit event' | translate}}
                     </button>
                     &nbsp;
                     <button ng-if="event._id" ng-click="openQuickAddTicket()" class="btn btn-success">
                         <span class="fa fa-user-plus vcenter"></span>
                         {{'Quick add ticket' | translate}}
                     </button>
+                    <span>
+                    <span class="label label-info vcenter pull-right">{{'Attendees:' | translate}} {{countAttendees}}</span>
+                    &nbsp;
+                    <span class="label label-warning vcenter pull-right">{{'Registered:' | translate}} {{((event.tickets || []) | registeredFilter).length}}</span>
+                    </span>
                 </h1>
-            </div><!--
-         --><div class="col-md-5 col-xs-5 vcenter">
-                <div class="row">
-                    <div class="col-md-6">
-                        <h2><div class="label label-warning vcenter">{{'Registered:' | translate}} {{((event.tickets || []) | registeredFilter).length}}</div></h2>
                     </div>
-                    <div class="col-md-6">
-                        <h2><div class="label label-info vcenter">{{'Attendees:' | translate}} {{countAttendees}}</div></h2>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8">
-                <div class="panel panel-primary table-striped top5">
-                    <div class="panel-heading">{{'tickets' | translate}}</div>
                     <div class="panel-body">
                         <form class="form-inline">
                             <div class="form-group">
                                 <label for="query-tickets">{{'Search:' | translate}}</label>
                                 <input eventman-focus type="text" id="query-tickets" class="form-control" placeholder="{{'Name or email' | translate}}" ng-model="query" ng-model-options="{debounce: 600}">
-                            </div>
+                            </div>&nbsp;<label>&nbsp;<input type="checkbox" ng-model="registeredFilterOptions.all" /> {{'Show cancelled tickets' | translate}}</label>
                         </form>
                         <table class="table table-striped">
                             <thead>
@@ -54,7 +43,7 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr ng-repeat="ticket in (event.tickets || []) | splittedFilter:query | registeredFilter | orderBy:ticketsOrder">
+                                <tr ng-repeat="ticket in (event.tickets || []) | splittedFilter:query | registeredFilter:registeredFilterOptions | orderBy:ticketsOrder">
                                     <td class="text-right">{{$index+1}}</td>
                                     <td>
                                         <span>
@@ -88,7 +77,7 @@
 
             <div class="col-md-4">
                 <div class="panel panel-info top5">
-                    <div class="panel-heading">{{'Unregistered persons' | translate}}</div>
+                    <div class="panel-heading"><h1>{{'Unregistered persons' | translate}}</h1></div>
                     <div class="panel-body small-table">
                         <table class="table table-striped table-condensed">
                             <thead>
diff --git a/angular_app/events-list.html b/angular_app/events-list.html
index 7dfb6e8..1ca4ea6 100644
--- a/angular_app/events-list.html
+++ b/angular_app/events-list.html
@@ -4,7 +4,7 @@
         <div class="panel-heading">
             <h1>{{'Events' | translate}}
                 <button ng-click="$state.go('event.new')" class="btn btn-success" ng-if="hasPermission('event|create')">
-                    <span class="fa fa-plus-circle vcenter"></span>
+                    <span class="fa fa-calendar vcenter"></span>
                     {{'Add event' | translate}}
                 </button>
             </h1>
@@ -52,7 +52,7 @@
                         </td>
                         <td>
                             <button ng-if="hasPermission('event:tickets-all|create')" ng-click="$state.go('event.ticket.new', {id: event._id})" class="btn btn-link fa fa-user-plus" type="button" title="{{'Join this event' | translate}}"></button>
-                            <button ng-if="hasPermission('tickets|update')" ng-click="$state.go('event.tickets', {id: event._id})" class="btn btn-link fa fa-list" type="button" title="{{'Manage attendees' | translate}}"></button>
+                            <button ng-if="hasPermission('ticket|update')" ng-click="$state.go('event.tickets', {id: event._id})" class="btn btn-link fa fa-ticket" type="button" title="{{'Manage tickets' | translate}}"></button>
                             <button ng-if="hasPermission('event|update')" ng-click="$state.go('event.edit', {id: event._id})" type="button" class="btn btn-link fa fa-cog fa-lg" title="{{'Edit' | translate}}"></button>
                             <button ng-if="hasPermission('event|delete')" ng-click="deleteEvent(event._id)" type="button" class="btn btn-link fa fa-trash fa-lg" title="{{'Delete' | translate}}"></button>
                         </td>
diff --git a/angular_app/import-persons.html b/angular_app/import-persons.html
index 74d8c41..556fc9a 100644
--- a/angular_app/import-persons.html
+++ b/angular_app/import-persons.html
@@ -1,20 +1,19 @@
-<!-- import persons -->
+<!-- import tickets -->
 <div class="container">
-    <h1>{{'Import persons' | translate}}</h1>
     <div class="panel panel-primary">
         <div class="panel-heading">
-            <div class="panel-title">{{'Import persons from eventbrite CSV' | translate}}</div>
+            <div class="panel-title"><h1>{{'Import tickets from Eventbrite CSV' | translate}}</h1></div>
         </div>
         <div class="panel-body">
             <form name="ebCSVForm" class="well">
                 <div class="form-group">
                     <label for="eb-csv-import">{{'CSV file' | translate}}</label>
                     <input name="file" ng-file-select ng-model="file" type="file" id="eb-csv-import" ng-required="true">
-                    <p class="help-block">{{'CSV exported from eventbrite' | translate}}</p>
+                    <p class="help-block">{{'CSV exported from Eventbrite' | translate}}</p>
                 </div>
                 
                 <div class="form-group">
-                    <label for="forEvent">{{'Associate users to this event' | translate}}</label>
+                    <label for="forEvent">{{'Associate tickets to this event' | translate}}</label>
                     <select class="form-control" id="forEvent" ng-model="targetEvent" ng-required="true">
                         <option ng-repeat="event in events" value="{{event._id}}">{{event.title}}</option>
                     </select>
diff --git a/angular_app/index.html b/angular_app/index.html
index f091851..76d2c7e 100644
--- a/angular_app/index.html
+++ b/angular_app/index.html
@@ -73,8 +73,8 @@
                     <div ng-if="logo.imgURL" class="navbar-brand"><a ng-if="logo.link" href="{{logo.link}}" target="_blank"><img src="{{logo.imgURL}}" /></a></div>
                     <ul class="nav navbar-nav">
                         <li ng-class="{active: isActive('/events') || isActive('/event')}"><a ui-sref="events">{{'Events' | translate}}</a></li>
+                        <li ng-if="hasPermission('admin|all')" ng-class="{active: isActive('/users') || isActive('/user')}"><a ui-sref="users">{{'Users' | translate}}</a></li>
                         <li ng-if="hasPermission('admin|all')" ng-class="{active: isActive('/tickets')}"><a ui-sref="tickets">{{'All tickets' | translate}}</a></li>
-                        <li ng-if="hasPermission('admin|all')" ng-class="{active: isActive('/users')}"><a ui-sref="users">{{'Users' | translate}}</a></li>
                         <li ng-if="hasPermission('admin|all')" ng-class="{active: isActive('/import/persons')}"><a ui-sref="import.persons">{{'Import tickets' | translate}}</a></li>
                     </ul>
                 </div>
diff --git a/angular_app/js/controllers.js b/angular_app/js/controllers.js
index c54ddcc..5657493 100644
--- a/angular_app/js/controllers.js
+++ b/angular_app/js/controllers.js
@@ -172,12 +172,14 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
         $scope.countAttendees = 0;
         $scope.message = {};
         $scope.event = {};
+        $scope.event.tickets = [];
         $scope.ticket = {}; // current ticket, for the event.ticket.* states
         $scope.tickets = []; // list of all tickets, for the 'tickets' state
         $scope.formSchema = {};
         $scope.formData = {};
         $scope.guiOptions = {dangerousActionsEnabled: false};
         $scope.customFields = Setting.query({setting: 'ticket_custom_field', in_event_details: true});
+        $scope.registeredFilterOptions = {all: true};
 
         $scope.formFieldsMap = {};
         $scope.formFieldsMapRev = {};
@@ -186,10 +188,11 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
             $scope.event = Event.get({id: $state.params.id}, function(data) {
                 $scope.$watchCollection(function() {
                         return $scope.event.tickets;
-                    }, function(prev, old) {
+                    }, function(new_collection, old_collection) {
                         $scope.calcAttendees();
                     }
                 );
+
                 if (!(data && data.formSchema)) {
                     return;
                 }
@@ -219,7 +222,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                 $scope.EventUpdates.open();
                 $scope.$watchCollection(function() {
                         return $scope.EventUpdates.data;
-                    }, function(prev, old) {
+                    }, function(new_collection, old_collection) {
                         if (!($scope.EventUpdates.data && $scope.EventUpdates.data.update)) {
                             return;
                         }
@@ -280,7 +283,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                 $scope.event.tickets = [];
             }
             var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) {
-                    return ticket._id == el._id;
+                return ticket._id == el._id;
             });
             if (ticket_idx != -1) {
                 $log.warn('ticket already present: not added');
@@ -289,7 +292,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
                 $scope.event.tickets.push(ticket);
             }
 
-            // Try to remove this person from the allPersons list using ID or email.
+            // Try to remove this person from the allPersons list using ID of the original entry or email.
             var field = null;
             var field_value = null;
             if (original_ticket && original_ticket._id) {
@@ -340,6 +343,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
             }
             var removed_person = $scope.event.tickets.splice(ticket_idx, 1);
             // to be used to populate allPersons, if needed.
+            var person = null;
             if (removed_person.length) {
                 person = removed_person[0];
             } else {
@@ -413,16 +417,17 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
 
         $scope.addTicket = function(ticket) {
             ticket.event_id = $state.params.id;
-            EventTicket.add(ticket, function(ticket) {
+            EventTicket.add(ticket, function(ret_ticket) {
                 $log.debug('addTicket');
-                $log.debug(ticket);
-                $scope._localAddTicket(ticket, ticket);
+                $log.debug(ret_ticket);
+                $scope._localAddTicket(ret_ticket, ticket);
                 if (!$state.is('event.tickets')) {
-                    $state.go('event.ticket.edit', {id: $scope.event._id, ticket_id: ticket._id});
+                    $state.go('event.ticket.edit', {id: $scope.event._id, ticket_id: ret_ticket._id});
                 } else {
                     $scope.query = '';
-                    $scope._setAttended(ticket);
+                    $scope._setAttended(ret_ticket);
                     if ($scope.$close) {
+                        // Close the Quick ticket modal.
                         $scope.$close();
                     }
                 }
diff --git a/angular_app/js/services.js b/angular_app/js/services.js
index 3acb671..b44749c 100644
--- a/angular_app/js/services.js
+++ b/angular_app/js/services.js
@@ -84,9 +84,6 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope',
                 isArray: true,
                 transformResponse: function(data, headers) {
                     data = angular.fromJson(data);
-                    if (data.error) {
-                        return data;
-                    }
                     return data.tickets;
                 }
             },
@@ -97,6 +94,9 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope',
                 interceptor : {responseError: $rootScope.errorHandler},
                 transformResponse: function(data, headers) {
                     data = angular.fromJson(data);
+                    if (data.error) {
+                        return data;
+                    }
                     return data.ticket;
                 }
             },
@@ -109,6 +109,9 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope',
                 params: {uuid: $rootScope.app_uuid},
                 transformResponse: function(data, headers) {
                     data = angular.fromJson(data);
+                    if (data.error) {
+                        return data;
+                    }
                     return data.ticket;
                 }
             },
@@ -120,6 +123,9 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope',
                 url: 'events/:event_id/tickets/:ticket_id',
                 params: {uuid: $rootScope.app_uuid},
                 transformResponse: function(data, headers) {
+                    if (data.error) {
+                        return data;
+                    }
                     return angular.fromJson(data);
                 }
             },
diff --git a/angular_app/ticket-edit.html b/angular_app/ticket-edit.html
index 3d6a221..76319d7 100644
--- a/angular_app/ticket-edit.html
+++ b/angular_app/ticket-edit.html
@@ -17,7 +17,7 @@
                                     {{'Event details' | translate}}
                                 </button>
                                 &nbsp;<button ng-click="$state.go('event.edit', {id: event._id})" class="btn btn-success" ng-if="event._id && hasPermission('event|update')">
-                                    <span class="fa fa-calendar vcenter"></span>
+                                    <span class="fa fa-gear vcenter"></span>
                                     {{'Edit event' | translate}}
                                 </button>
                                 &nbsp;<button ng-click="$state.go('event.tickets', {id: event._id})" class="btn btn-success" ng-if="event._id && hasPermission('event:tickets-all|read')">
diff --git a/eventman_server.py b/eventman_server.py
index 607898a..3c4be3e 100755
--- a/eventman_server.py
+++ b/eventman_server.py
@@ -823,11 +823,8 @@ class EbCSVImportPersonsHandler(BaseHandler):
         'Email': 'email',
         'Attendee #': 'attendee_nr',
         'Barcode #': 'ebqrcode',
-        'Company': 'company',
+        'Company': 'company'
     }
-    # Only these information are stored in the person collection.
-    keepPersonData = ('name', 'surname', 'email', 'name_title', 'name_suffix',
-            'company', 'job_title')
 
     @gen.coroutine
     @authenticated
@@ -840,6 +837,8 @@ class EbCSVImportPersonsHandler(BaseHandler):
             event_id = self.get_body_argument('targetEvent')
         except:
             pass
+        if event_id is None:
+            return self.build_error('invalid event')
         reply = dict(total=0, valid=0, merged=0, new_in_event=0)
         for fieldname, contents in self.request.files.iteritems():
             for content in contents: