diff --git a/src/docs/views/invoice.py b/src/docs/views/invoice.py
index 30f8f83..5cdf7d2 100644
--- a/src/docs/views/invoice.py
+++ b/src/docs/views/invoice.py
@@ -86,8 +86,11 @@ class InvoiceViews(BaseItemsViews):
             obj.sum_full_total_price += utils.get_full_total_price(item)
 
         if obj.nds_method == NDS_IN_AMOUNT:
-            s = 'В том числе НДС(%s)' % obj.get_nds_value_display()
+            if obj.get_nds_value_display() == 'Без НДС':
+                s = obj.get_nds_value_display()
+            else:
+                s = f'В том числе НДС({obj.get_nds_value_display()})'
         else:
-            s = 'Итого НДС (%s)' % obj.get_nds_value_display()
+            s = f'Итого НДС ({obj.get_nds_value_display()})'
 
         obj.nds_itogo_text = s
diff --git a/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js b/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js
deleted file mode 100644
index 10ef298..0000000
--- a/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copy+pasted from /static/filer/js/popup_handling.js, because we can't always count on this being loaded.
-
-(function($) {
-	dismissPopupAndReload = function(win) {
-		document.location.reload();
-		win.close();
-	};
-	dismissRelatedImageLookupPopup = function(win, chosenId, chosenThumbnailUrl, chosenDescriptionTxt) {
-		var name = windowname_to_id(win.name);
-		var img_name = name + '_thumbnail_img';
-		var txt_name = name + '_description_txt';
-		var clear_name = name + '_clear';
-		var elem = document.getElementById(name);
-		document.getElementById(name).value = chosenId;
-		document.getElementById(img_name).src = chosenThumbnailUrl;
-		document.getElementById(txt_name).innerHTML = chosenDescriptionTxt;
-		document.getElementById(clear_name).style.display = 'inline';
-		win.close();
-	};
-	dismissRelatedFolderLookupPopup = function(win, chosenId, chosenName) {
-		var id = windowname_to_id(win.name);
-		var id_name = id + '_description_txt';
-		document.getElementById(id).value = chosenId;
-		document.getElementById(id_name).innerHTML = chosenName;
-		win.close();
-	};
-})(jQuery);
-
-CKEDITOR.dialog.add( 'filerImageDialog', function ( editor ) {
-    dialog = CKEDITOR.dialog.getCurrent();
-    var imageWidth = 0;
-    var imageHeight = 0;
-    
-    function getImageUrl() {
-        var url = dialog.getContentElement("tab-basic", "url");
-        var thumb_sel_val = dialog.getContentElement("tab-basic", "thumbnail_option").getValue();
-        if (thumb_sel_val != 0) {
-            server_url = '?djangocms_ckeditor_filer_image='+ django.jQuery('#id_image').val() + '&thumb_options=' + thumb_sel_val;
-        } else {
-            width = dialog.getContentElement("tab-basic", "width").getValue();
-            height = dialog.getContentElement("tab-basic", "height").getValue();
-            server_url = '?djangocms_ckeditor_filer_image='+ django.jQuery('#id_image').val() + '&width=' + width + '&height=' + height;
-        }
-        django.jQuery.get(server_url, function(data) {
-            url.setValue(data.url);
-            imageWidth = data.width;
-            imageHeight = data.height;
-        });
-    }
-    return {
-        title: 'Filer Image Properties',
-        minWidth: 400,
-        minHeight: 200,
-
-        onShow: function() {
-            dialog = CKEDITOR.dialog.getCurrent();
-            var document = this.getElement().getDocument();
-            // document = CKEDITOR.dom.document
-            var id_image = document.getById( 'id_image' );
-            var oldVal = id_image.getValue();
-            
-            setInterval(function () {
-                if (oldVal != id_image.getValue()) {
-                    oldVal = id_image.getValue();
-                    getImageUrl();
-                }
-            }, 1000);
-            if ( id_image )
-                id_image.hide();
-            var id_image_clear = document.getById( 'id_image_clear' );
-            
-            id_image_clear.on('click', function () {
-                id_image.setValue("");
-                id_image.removeAttribute("value");
-                id_image_thumbnail_img = document.getById( 'id_image_thumbnail_img' );
-                id_image_thumbnail_img.setAttribute("src", editor.config.settings.static_url +'/../filer/icons/nofile_48x48.png');
-                id_image_description_txt = document.getById( 'id_image_description_txt' );
-                id_image_description_txt.setHtml("");
-                id_image_clear = document.getById( 'id_image_clear' );
-                id_image_clear.hide();
-            });
-
-            // Get the selection in the editor.
-            var selection = editor.getSelection();
-
-            // Get the element at the start of the selection.
-            var element = selection.getStartElement();
-
-            // Get the <img> element closest to the selection, if any.
-            if ( element )
-                element = element.getAscendant( 'img', true );
-
-            // Create a new <img> element if it does not exist.
-            if ( !element || element.getName() != 'img' ) {
-                element = editor.document.createElement( 'img' );
-
-                // Flag the insertion mode for later use.
-                this.insertMode = true;
-            }
-            else
-                this.insertMode = false;
-
-            // Store the reference to the <abbr> element in an internal property, for later use.
-            this.element = element;
-
-            // Invoke the setup methods of all dialog elements, so they can load the element attributes.
-            if ( !this.insertMode )
-                this.setupContent( this.element );
-            else
-                id_image_clear.fire('click');
-        },
-        // This method is invoked once a user clicks the OK button, confirming the dialog.
-        onOk: function() {
-
-            // The context of this function is the dialog object itself.
-            // http://docs.ckeditor.com/#!/api/CKEDITOR.dialog
-            var dialog = this;
-
-            // Creates a new <abbr> element.
-            var abbr = this.element;
-
-            // Invoke the commit methods of all dialog elements, so the <abbr> element gets modified.
-            this.commitContent( abbr );
-
-            // Finally, in if insert mode, inserts the element at the editor caret position.
-            if ( this.insertMode )
-                editor.insertElement( abbr );
-        },
-
-        contents: [
-            {
-                id: 'tab-basic',
-                label: 'Basic Settings',
-                elements: [
-                    {
-                        type: 'html',
-                        html:
-                            '<div class="field-box field-image">' +
-                                '<label for="id_image">Image:</label>' +
-                                '<img alt="no file selected" class="quiet" src="'+ editor.config.settings.static_url +'/../filer/icons/nofile_48x48.png" id="id_image_thumbnail_img">' +
-                                '&nbsp;<span id="id_image_description_txt"></span>' +
-                                '<a onclick="return showRelatedObjectLookupPopup(this);" title="Pretraži" id="lookup_id_image" class="related-lookup" href="/admin/filer/folder/last/?t=file_ptr">' +
-                                    '<img width="16" height="16" alt="Pretraži" src="'+ editor.config.settings.static_url +'/../admin/img/icon_searchbox.png">' +
-                                '</a>' +
-                                '<img width="10" height="10" style="display: none;" title="Očisti" alt="Očisti" src="'+ editor.config.settings.static_url +'/../admin/img/icon_deletelink.gif" id="id_image_clear">' +
-                                '<br><input type="text" id="id_image" name="image" class="vForeignKeyRawIdAdminField">' +
-                            '</div>',
-                    },
-                    {
-                        type: 'text',
-                        id: 'url',
-                        label: 'Url',
-                        setup: function( element ) {
-                            this.setValue( element.getAttribute( "src" ) );
-                        },
-                        // Called by the main commitContent call on dialog confirmation.
-                        commit: function( element ) {
-                            element.setAttribute( "src", this.getValue() );
-                        }
-                    },
-                    {
-                        type: 'text',
-                        id: 'caption',
-                        label: 'Caption',
-                        setup: function( element ) {
-                            this.setValue( element.getAttribute( "title" ) );
-                        },
-                        // Called by the main commitContent call on dialog confirmation.
-                        commit: function( element ) {
-                            element.setAttribute( "title", this.getValue() );
-                        }
-                    },
-                    {
-                        type: 'text',
-                        id: 'alt_text',
-                        label: 'Alt',
-                        setup: function( element ) {
-                            this.setValue( element.getAttribute( "alt" ) );
-                        },
-                        // Called by the main commitContent call on dialog confirmation.
-                        commit: function( element ) {
-                            element.setAttribute( "alt", this.getValue() );
-                        }
-                    },
-                    {
-                        type: 'hbox',
-                        widths: [ '50%', '50%', ],
-                        children: [
-                            {
-                                type: 'checkbox',
-                                id: 'use_original_image',
-                                label: 'Use original image',
-                                setup: function( element ) {
-                                    this.setValue( element.getAttribute( "original_image" ) );
-                                },
-                                // Called by the main commitContent call on dialog confirmation.
-                                commit: function( element ) {
-                                    element.setAttribute( "original_image", this.getValue() );
-                                }
-                            },
-                            {
-                                type: 'select',
-                                id: 'thumbnail_option',
-                                items : [ ['--- Thumbnail ---',0] ],
-                                onLoad : function() {
-                                    var element_id = '#' + this.getInputElement().$.id;
-                                    django.jQuery.ajax({
-                                        type: 'GET',
-                                        url: '?djangocms_ckeditor_filer_thumbnail_options',
-                                        contentType: 'application/json; charset=utf-8',
-                                        dataType: 'json',
-                                        async: false,
-                                        success: function(data) {
-                                            django.jQuery.each(data, function(index, item) {
-                                                django.jQuery(element_id).get(0).options[django.jQuery(element_id).get(0).options.length] = new Option(item.name, item.id);
-                                            });
-                                        },
-                                        error:function (xhr, ajaxOptions, thrownError){
-                                            alert(xhr.status);
-                                            alert(thrownError);
-                                        } 
-                                    });
-                                },
-                                onChange: function() {
-                                    getImageUrl();
-                                },
-                                setup: function( element ) {
-                                    this.setValue( element.getAttribute( "thumb_option" ) );
-                                },
-                                // Called by the main commitContent call on dialog confirmation.
-                                commit: function( element ) {
-                                    element.setAttribute( "thumb_option", this.getValue() );
-                                }
-                            },
-                        ]
-                    },
-                    {
-                        type: 'hbox',
-                        widths: [ '50%', '50%', ],
-                        children: [
-                            {
-                                type: 'text',
-                                id: 'width',
-                                label: 'Width',
-                                onChange: function () {
-                                    if (this.getValue() != "") {
-                                        ratio = this.getValue() / imageWidth;   // get ratio for scaling image
-                                        dialog.getContentElement("tab-basic", "height").setValue(Math.ceil(imageHeight * ratio));
-                                    }
-                                    
-                                    //getImageUrl();
-                                },
-                                setup: function( element ) {
-                                    this.setValue( element.getAttribute( "width" ) );
-                                },
-                                // Called by the main commitContent call on dialog confirmation.
-                                commit: function( element ) {
-                                    element.setAttribute( "width", this.getValue() );
-                                }
-                            },
-                            {
-                                type: 'text',
-                                id: 'height',
-                                label: 'Height',
-                                onChange: function () {
-                                    getImageUrl();
-                                },
-                                setup: function( element ) {
-                                    this.setValue( element.getAttribute( "height" ) );
-                                },
-                                // Called by the main commitContent call on dialog confirmation.
-                                commit: function( element ) {
-                                    element.setAttribute( "height", this.getValue() );
-                                }
-                            },
-                        ]
-                    },
-                    {
-                        type: 'hbox',
-                        widths: [ '33%', '33%', '33%' ],
-                        children: [
-                            {
-                                type: 'checkbox',
-                                id: 'crop',
-                                label: 'Crop',
-                            },
-                            {
-                                type: 'checkbox',
-                                id: 'upscale',
-                                label: 'Upscale',
-                            },
-                            {
-                                type: 'checkbox',
-                                id: 'use_autoscale',
-                                label: 'Autoscale',
-                            },
-                        ]
-                    },
-                    {
-                        type: 'select',
-                        id: 'alignment',
-                        label : 'Alignment',
-                        items: [ ["left"], ["right"] ],
-                        setup: function( element ) {
-                            this.setValue( element.getAttribute( "align" ) );
-                        },
-                        // Called by the main commitContent call on dialog confirmation.
-                        commit: function( element ) {
-                            element.setAttribute( "align", this.getValue() );
-                        }
-                    },
-                    {
-                        type: 'checkbox',
-                        id: 'target_blank',
-                        label: 'Target blank',                       
-                    },
-                ]
-            },
-            {
-                id: 'tab-adv',
-                label: 'Advanced Settings',
-                elements: [
-                    {
-                        type: 'text',
-                        id: 'css_style',
-                        label: 'CSS',
-                    },
-                ]
-            }
-        ]
-    };
-});
diff --git a/static/ckeditor/plugins/filerimage/icons/filerimage.png b/static/ckeditor/plugins/filerimage/icons/filerimage.png
deleted file mode 100644
index d581b16..0000000
Binary files a/static/ckeditor/plugins/filerimage/icons/filerimage.png and /dev/null differ
diff --git a/static/ckeditor/plugins/filerimage/plugin.js b/static/ckeditor/plugins/filerimage/plugin.js
deleted file mode 100644
index e81227e..0000000
--- a/static/ckeditor/plugins/filerimage/plugin.js
+++ /dev/null
@@ -1,33 +0,0 @@
-CKEDITOR.plugins.add( 'filerimage', {
-	icons: 'filerimage',
-	init: function( editor ) {
-		editor.addCommand( 'filerImageDialog', new CKEDITOR.dialogCommand( 'filerImageDialog' ) );
-
-		editor.ui.addButton( 'Filer Image', {
-			label: 'Insert filer image',
-			command: 'filerImageDialog',
-			toolbar: 'insert',
-			icon: 'filerimage'
-		});
-
-		if ( editor.contextMenu ) {
-			editor.addMenuGroup( 'Filer' );
-			editor.addMenuItem( 'imageItem', {
-				label: 'Edit image',
-				icon: this.path + 'icons/filerimage.png',
-				command: 'filerImageDialog',
-				group: 'Filer'
-			});
-
-			editor.contextMenu.addListener( function( element ) {
-				if ( element.getAscendant( 'img', true ) ) {
-					return { imageItem: CKEDITOR.TRISTATE_OFF };
-				}
-			});
-		}
-
-		CKEDITOR.dialog.add( 'filerImageDialog', this.path + 'dialogs/filerImageDialog.js' );
-
-		var dialog = CKEDITOR.dialog.getCurrent();
-	}
-});
diff --git a/templates/docs/invoice/as_pdf.html b/templates/docs/invoice/as_pdf.html
index 4ec2db4..e0dacde 100644
--- a/templates/docs/invoice/as_pdf.html
+++ b/templates/docs/invoice/as_pdf.html
@@ -94,8 +94,9 @@
 </div>
 
 <div id="content_middle">
-    Покупатель: {{ obj.client.name }},
-    ИНН {{ obj.client.get_inn_and_kpp }},
+    <b>Покупатель</b>:
+    <br /> {{ obj.client.name }},
+    ИНН/КПП {{ obj.client.get_inn_and_kpp }},
     {{ obj.client.address }}
     {% if obj.client.contact_phone %} , тел. {{ obj.client.contact_phone }}{% endif %}
 
@@ -123,15 +124,15 @@
         {# --- итоги --- #}
 
         <tr class="row no_borders">
-            <td class="top_border" colspan="5"><b>Итого:</b></td>
+            <td class="top_border" colspan="5" style="text-align: right;"><b>Итого:</b></td>
             <td class="borders" align="right"><b>{{ obj.sum_total_price|floatformat:2 }}</b></td>
         </tr>
 
         <tr class="row no_borders">
-            <td colspan="5">
+            <td colspan="5" style="text-align: right;">
                 <b>{{ obj.nds_itogo_text }}</b>:
             </td>
-            <td class="borders" align="right">
+            <td class="borders" align="right" style="text-align: right;">
                 <b>
                 {{ obj.sum_total_nds|floatformat:2 }}
                 </b>
@@ -139,8 +140,8 @@
         </tr>
 
         <tr class="row no_borders">
-            <td colspan="5"><b>Всего к оплате:</b></td>
-            <td class="borders" align="right"><b>{{ obj.sum_full_total_price|floatformat:2 }}</b></td>
+            <td colspan="5" style="text-align: right;"><b>Всего к оплате:</b></td>
+            <td class="borders" align="right" style="text-align: right;"><b>{{ obj.sum_full_total_price|floatformat:2 }}</b></td>
         </tr>
     </table>
 </div>
@@ -170,13 +171,13 @@
             <td colspan="2">
                 {{ profile.get_boss_title }}
             </td>
-            <td class="bottom_border">
+            <td class="bottom_border" width="30%">
                 {% if doc_sign and profile.boss_sign %} {# TODO передавать флаг из вьюхи #}
                     <img src="{{ profile.boss_sign.path }}" /> {# подпись руководителя #}
                 {% endif %}
             </td>
-            <td></td>
-            <td>
+            <td width="1%"></td>
+            <td width="30%">
                 ({{ profile.get_boss_fio }}) {# фио руководителя #}
             </td>
         </tr>
@@ -186,22 +187,22 @@
         {% if profile.is_ip and profile.get_glavbuh_fio %} {# ИП #}
             <tr>
                 <td colspan="2">Главный бухгалтер</td>
-                <td class="bottom_border">
+                <td class="bottom_border" width="30%">
                     {% if doc_sign and profile.glavbuh_sign %} {# TODO передавать флаг из вьюхи #}
                         <img src="{{ profile.glavbuh_sign.path }}" /> {# подпись главбуха #}
                     {% else %}
                         <br />&nbsp;
                     {% endif %}
                 </td>
-                <td></td>
-                <td>({{ profile.get_glavbuh_fio }})</td> {# фио главбуха #}
+                <td width="1%"></td>
+                <td width="30%">({{ profile.get_glavbuh_fio }})</td> {# фио главбуха #}
             </tr>
         {% endif %}
 
         {% if profile.is_org %} {# Орг #}
             <tr>
                 <td colspan="2">Главный бухгалтер</td>
-                <td class="bottom_border">
+                <td class="bottom_border" width="30%">
                     {% if doc_sign and profile.glavbuh_sign %}
                         <img src="{{ profile.glavbuh_sign.path }}" /> {# подпись главбуха #}
                     {% else %}
@@ -212,8 +213,8 @@
                         {% endif %}
                     {% endif %}
                 </td>
-                <td></td>
-                <td>
+                <td width="1%"></td>
+                <td width="30%">
                     ({{ profile.get_glavbuh_fio|default:profile.get_boss_fio }}) {# фио главбуха #}
                 </td>
             </tr>
@@ -222,7 +223,7 @@
         {# --------------------------------------------------------------------- #}
 
         <tr>
-            <td></td>
+            <td width="15%"></td>
             <td colspan="2" class="left">
                 {% if doc_sign and profile.stamp %} {# TODO передавать флаг из вьюхи #}
                     <img src="{{ profile.stamp.path }}" /> {# печать #}