diff --git a/public/user_content/event_images/.gitignore b/public/user_content/event_images/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/public/user_content/event_images/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php
index c20a95ad..79d7163a 100644
--- a/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php
@@ -154,7 +154,7 @@
                     <div class="col-xs-6">
                         <div class="form-group">
                             {!! Form::label('card-expiry-year', 'Exipry Year') !!}
-                            {!!  Form::selectRange('card-expiry-year',14,24,null, [
+                            {!!  Form::selectRange('card-expiry-year',date('Y'),date('Y')+10,null, [
                                     'class' => 'form-control card-expiry-year',
                                     'data-stripe' => 'exp_year'
                                 ] )  !!}</div>
diff --git a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
index c7b43189..0172b8b8 100644
--- a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
@@ -168,6 +168,36 @@
                                     {{money($order->total_amount, $order->event->currency->code)}}
                                 </td>
                             </tr>
+                            @if($order->is_refunded || $order->is_partially_refunded)
+                                <tr>
+                                    <td>
+                                    </td>
+                                    <td>
+                                    </td>
+                                    <td>
+                                    </td>
+                                    <td>
+                                        <b>Refunded Amount</b>
+                                    </td>
+                                    <td colspan="2">
+                                        {{money($order->amount_refunded, $order->event->currency->code)}}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                    </td>
+                                    <td>
+                                    </td>
+                                    <td>
+                                    </td>
+                                    <td>
+                                        <b>Total</b>
+                                    </td>
+                                    <td colspan="2">
+                                        {{money($order->total_amount - $order->amount_refunded, $order->event->currency->code)}}
+                                    </td>
+                                </tr>
+                            @endif
                         </tbody>
                     </table>
 
@@ -190,6 +220,11 @@
                                 <td>
                                     {{{$attendee->ticket->title}}}
                                 </td>
+                                <td>
+                                    @if($attendee->is_cancelled)
+                                        Cancelled
+                                    @endif
+                                </td>
                             </tr>
                             @endforeach
                         </tbody>
diff --git a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php
index d6ec52ea..75c68809 100644
--- a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php
@@ -136,51 +136,51 @@
             {{--</div>--}}
 
             @foreach($attendees as $attendee)
-            <div class="ticket">
+                @if(!$attendee->is_cancelled)
+                    <div class="ticket">
 
-                <div class='logo'>
-<!--                    <img src="http://dev.attendize.com/assets/images/logo-100x100-lightBg.png" />-->
-                    <img src="{{empty(config('attendize.cdn_url_user_assets')) ? url('/'.$event->organiser->logo_path) : config('attendize.cdn_url_user_assets').'/'.$event->organiser->logo_path}}" />
-                </div>
+                        <div class='logo'>
+                            <img src="{{empty(config('attendize.cdn_url_user_assets')) ? url('/'.$event->organiser->logo_path) : config('attendize.cdn_url_user_assets').'/'.$event->organiser->logo_path}}" />
+                        </div>
 
-                <div class="event_details">
-                    <div class="top_barcode hide">
-                        <img src="data:image/png; base64,{!! \DNS1D::getBarcodePNG("4", "C39+", 4, 40) !!}" alt="barcode"   />
+                        <div class="event_details">
+                            <div class="top_barcode hide">
+                                <img src="data:image/png; base64,{!! \DNS1D::getBarcodePNG("4", "C39+", 4, 40) !!}" alt="barcode"   />
+                            </div>
+                            <h4>Event</h4>
+                            {{$event->title}}
+                            <h4>Organiser</h4>
+                            {{$event->organiser->name}}
+                            <h4>Venue</h4>
+                            {{$event->venue_name}}
+                            <h4>Start Date / Time</h4>
+                            {{$event->start_date->format('M dS g:iA')}}
+                            <h4>End Date / Time</h4>
+                            {{$event->end_date->format('M dS g:iA')}}
+                        </div>
+
+                        <div class="attendee_details">
+                            <h4>Name</h4>
+                            {{{$attendee->first_name.' '.$attendee->last_name}}}
+
+                            <h4>Ticket Type</h4>
+                            {{{$attendee->ticket->title}}}
+                            <h4>Order Ref.</h4>
+                            #{{$order->order_reference}}
+                            <h4>Attendee Ref.</h4>
+                            #{{$attendee->reference}}
+                            <h4>Price</h4>
+                            {{money($attendee->ticket->total_price, $order->event->currency->code)}} (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency->code)}} Fees)
+                        </div>
+
+                        <div class="barcode">
+                            {!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!}
+                        </div>
+                        <div class="barcode_vertical">
+                            {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "EAN2", 1, 40) !!}
+                        </div>
                     </div>
-                    <h4>Event</h4>
-                    {{$event->title}}
-                    <h4>Organiser</h4>
-                    {{$event->organiser->name}}
-                    <h4>Venue</h4>
-                    {{$event->venue_name}}
-                    <h4>Start Date / Time</h4>
-                    {{$event->start_date->format('M dS g:iA')}}
-                    <h4>End Date / Time</h4>
-                    {{$event->end_date->format('M dS g:iA')}}
-                </div>
-
-                <div class="attendee_details">
-                    <h4>Name</h4>
-                    {{{$attendee->first_name.' '.$attendee->last_name}}}
-
-                    <h4>Ticket Type</h4>
-                    {{{$attendee->ticket->title}}}
-                    <h4>Order Ref.</h4>
-                    #{{$order->order_reference}}
-                    <h4>Attendee Ref.</h4>
-                    #{{$attendee->reference}}
-                    <h4>Price</h4>
-                    {{money($attendee->ticket->total_price, $order->event->currency->code)}} (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency->code)}} Fees)
-                </div>
-
-                <div class="barcode">
-                    {!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!}
-                </div>
-                <div class="barcode_vertical">
-                    {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "EAN2", 1, 40) !!}
-                </div>
-            </div>
-
+                @endif
             @endforeach
 
             <div class="bottom_info">