diff --git a/docs/mkdocs_en.yml b/docs/mkdocs_en.yml
index ec933308103..5966c952a03 100644
--- a/docs/mkdocs_en.yml
+++ b/docs/mkdocs_en.yml
@@ -22,8 +22,6 @@ theme:
     primary: 'white'
     accent: 'white'
   font: false
-#    text: Roboto
-#    code: Roboto Mono
   logo: 'images/logo.svg'
   favicon: 'assets/images/favicon.ico'
   include_search_page: false
@@ -53,12 +51,12 @@ pages:
 - 'Getting started':
   - 'Deploying and running': 'getting_started/index.md'
   - 'Testing data':
-    - 'AMPLab Big Data Benchmark': 'getting_started/example_datasets/amplab_benchmark.md'
-    - 'Terabyte of click logs from Criteo': 'getting_started/example_datasets/criteo.md'
-    - 'Data about New York taxis': 'getting_started/example_datasets/nyc_taxi.md'
     - 'OnTime': 'getting_started/example_datasets/ontime.md'
-    - 'Star scheme': 'getting_started/example_datasets/star_schema.md'
+    - 'New York Taxi data': 'getting_started/example_datasets/nyc_taxi.md'
+    - 'AMPLab Big Data Benchmark': 'getting_started/example_datasets/amplab_benchmark.md'
     - 'WikiStat': 'getting_started/example_datasets/wikistat.md'
+    - 'Terabyte click logs from Criteo': 'getting_started/example_datasets/criteo.md'
+    - 'Star Schema Benchmark': 'getting_started/example_datasets/star_schema.md'
 
 - 'Interfaces':
   - 'Interfaces': 'interfaces/index.md'
@@ -77,95 +75,95 @@ pages:
 
 - 'Table engines':
   - 'Introduction': 'table_engines/index.md'
-  - 'AggregatingMergeTree': 'table_engines/aggregatingmergetree.md'
-  - 'Buffer': 'table_engines/buffer.md'
-  - 'CollapsingMergeTree': 'table_engines/collapsingmergetree.md'
-  - 'Custom partitioning key': 'table_engines/custom_partitioning_key.md'
-  - 'Distributed': 'table_engines/distributed.md'
-  - 'External data for query processing': 'table_engines/external_data.md'
-  - 'File(InputFormat)': 'table_engines/file.md'
-  - 'GraphiteMergeTree': 'table_engines/graphitemergetree.md'
-  - 'Join': 'table_engines/join.md'
-  - 'Kafka': 'table_engines/kafka.md'
-  - 'Log': 'table_engines/log.md'
-  - 'MaterializedView': 'table_engines/materializedview.md'
-  - 'Memory': 'table_engines/memory.md'
-  - 'Merge': 'table_engines/merge.md'
-  - 'MergeTree': 'table_engines/mergetree.md'
-  - 'Null': 'table_engines/null.md'
-  - 'ReplacingMergeTree': 'table_engines/replacingmergetree.md'
-  - 'Data replication': 'table_engines/replication.md'
-  - 'Set': 'table_engines/set.md'
-  - 'SummingMergeTree': 'table_engines/summingmergetree.md'
   - 'TinyLog': 'table_engines/tinylog.md'
+  - 'Log': 'table_engines/log.md'
+  - 'Memory': 'table_engines/memory.md'
+  - 'MergeTree': 'table_engines/mergetree.md'
+  - 'Custom partitioning key': 'table_engines/custom_partitioning_key.md'
+  - 'ReplacingMergeTree': 'table_engines/replacingmergetree.md'
+  - 'SummingMergeTree': 'table_engines/summingmergetree.md'
+  - 'AggregatingMergeTree': 'table_engines/aggregatingmergetree.md'
+  - 'CollapsingMergeTree': 'table_engines/collapsingmergetree.md'
+  - 'GraphiteMergeTree': 'table_engines/graphitemergetree.md'
+  - 'Data replication': 'table_engines/replication.md'
+  - 'Distributed': 'table_engines/distributed.md'
+  - 'Merge': 'table_engines/merge.md'
+  - 'Buffer': 'table_engines/buffer.md'
+  - 'File': 'table_engines/file.md'
+  - 'Null': 'table_engines/null.md'
+  - 'Set': 'table_engines/set.md'
+  - 'Join': 'table_engines/join.md'
   - 'View': 'table_engines/view.md'
+  - 'MaterializedView': 'table_engines/materializedview.md'
+  - 'Kafka': 'table_engines/kafka.md'
+  - 'External data for query processing': 'table_engines/external_data.md'
 
 - 'System tables':
   - 'Introduction': 'system_tables/index.md'
-  - 'system.asynchronous_metrics': 'system_tables/system.asynchronous_metrics.md'
-  - 'system.clusters': 'system_tables/system.clusters.md'
-  - 'system.columns': 'system_tables/system.columns.md'
-  - 'system.databases': 'system_tables/system.databases.md'
-  - 'system.dictionaries': 'system_tables/system.dictionaries.md'
-  - 'system.events': 'system_tables/system.events.md'
-  - 'system.functions': 'system_tables/system.functions.md'
-  - 'system.merges': 'system_tables/system.merges.md'
-  - 'system.metrics': 'system_tables/system.metrics.md'
+  - 'system.one': 'system_tables/system.one.md'
   - 'system.numbers': 'system_tables/system.numbers.md'
   - 'system.numbers_mt': 'system_tables/system.numbers_mt.md'
-  - 'system.one': 'system_tables/system.one.md'
+  - 'system.databases': 'system_tables/system.databases.md'
+  - 'system.tables': 'system_tables/system.tables.md'
+  - 'system.columns': 'system_tables/system.columns.md'
   - 'system.parts': 'system_tables/system.parts.md'
   - 'system.processes': 'system_tables/system.processes.md'
+  - 'system.merges': 'system_tables/system.merges.md'
+  - 'system.events': 'system_tables/system.events.md'
+  - 'system.metrics': 'system_tables/system.metrics.md'
+  - 'system.asynchronous_metrics': 'system_tables/system.asynchronous_metrics.md'
   - 'system.replicas': 'system_tables/system.replicas.md'
+  - 'system.dictionaries': 'system_tables/system.dictionaries.md'
+  - 'system.clusters': 'system_tables/system.clusters.md'
+  - 'system.functions': 'system_tables/system.functions.md'
   - 'system.settings': 'system_tables/system.settings.md'
-  - 'system.tables': 'system_tables/system.tables.md'
   - 'system.zookeeper': 'system_tables/system.zookeeper.md'
 
 - 'Table functions':
   - 'Introduction': 'table_functions/index.md'
-  - 'merge': 'table_functions/merge.md'
   - 'remote': 'table_functions/remote.md'
+  - 'merge': 'table_functions/merge.md'
 
 - 'Formats':
   - 'Introduction': 'formats/index.md'
-  - 'CapnProto': 'formats/capnproto.md'
+  - 'TabSeparated': 'formats/tabseparated.md'
+  - 'TabSeparatedRaw': 'formats/tabseparatedraw.md'
+  - 'TabSeparatedWithNames': 'formats/tabseparatedwithnames.md'
+  - 'TabSeparatedWithNamesAndTypes': 'formats/tabseparatedwithnamesandtypes.md'
   - 'CSV': 'formats/csv.md'
   - 'CSVWithNames': 'formats/csvwithnames.md'
+  - 'Values': 'formats/values.md'
+  - 'Vertical': 'formats/vertical.md'
   - 'JSON': 'formats/json.md'
   - 'JSONCompact': 'formats/jsoncompact.md'
   - 'JSONEachRow': 'formats/jsoneachrow.md'
-  - 'Native': 'formats/native.md'
-  - 'Null': 'formats/null.md'
+  - 'TSKV': 'formats/tskv.md'
   - 'Pretty': 'formats/pretty.md'
   - 'PrettyCompact': 'formats/prettycompact.md'
   - 'PrettyCompactMonoBlock': 'formats/prettycompactmonoblock.md'
   - 'PrettyNoEscapes': 'formats/prettynoescapes.md'
   - 'PrettySpace': 'formats/prettyspace.md'
   - 'RowBinary': 'formats/rowbinary.md'
-  - 'TabSeparated': 'formats/tabseparated.md'
-  - 'TabSeparatedRaw': 'formats/tabseparatedraw.md'
-  - 'TabSeparatedWithNames': 'formats/tabseparatedwithnames.md'
-  - 'TabSeparatedWithNamesAndTypes': 'formats/tabseparatedwithnamesandtypes.md'
-  - 'TSKV': 'formats/tskv.md'
-  - 'Values': 'formats/values.md'
-  - 'Vertical': 'formats/vertical.md'
+  - 'Native': 'formats/native.md'
+  - 'Null': 'formats/null.md'
   - 'XML': 'formats/xml.md'
+  - 'CapnProto': 'formats/capnproto.md'
 
 - 'Data types':
   - 'Introduction': 'data_types/index.md'
-  - 'Array(T)': 'data_types/array.md'
+  - 'UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64': 'data_types/int_uint.md'
+  - 'Float32, Float64': 'data_types/float.md'
   - 'Boolean values': 'data_types/boolean.md'
+  - 'String': 'data_types/string.md'
+  - 'FixedString(N)': 'data_types/fixedstring.md'
   - 'Date': 'data_types/date.md'
   - 'DateTime': 'data_types/datetime.md'
   - 'Enum': 'data_types/enum.md'
-  - 'FixedString(N)': 'data_types/fixedstring.md'
-  - 'Float32, Float64': 'data_types/float.md'
-  - 'UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64': 'data_types/int_uint.md'
-  - 'String': 'data_types/string.md'
+  - 'Array(T)': 'data_types/array.md'
+  - 'AggregateFunction(name, types_of_arguments...)': 'data_types/nested_data_structures/aggregatefunction.md'
   - 'Tuple(T1, T2, ...)': 'data_types/tuple.md'
   - 'Nested data structures':
 #  - 'Вложенные структуры данных': 'data_types/nested_data_structures/index.md'
-    - 'AggregateFunction(name, types_of_arguments...)': 'data_types/nested_data_structures/aggregatefunction.md'
     - 'Nested(Name1 Type1, Name2 Type2, ...)': 'data_types/nested_data_structures/nested.md'
   - 'Special data types':
 #  - 'Служебные типы данных': 'data_types/special_data_types/index.md'
@@ -177,31 +175,31 @@ pages:
 - 'Functions':
   - 'Introduction': 'functions/index.md'
   - 'Arithmetic functions': 'functions/arithmetic_functions.md'
-  - 'Functions for working with arrays': 'functions/array_functions.md'
-  - 'arrayJoin function': 'functions/array_join.md'
-  - 'Bit functions': 'functions/bit_functions.md'
   - 'Comparison functions': 'functions/comparison_functions.md'
-  - 'Conditional functions': 'functions/conditional_functions.md'
+  - 'Logical functions': 'functions/logical_functions.md'
+  - 'Type conversion functions': 'functions/type_conversion_functions.md'
   - 'Functions for working with dates and times': 'functions/date_time_functions.md'
-  - 'Encoding functions': 'functions/encoding_functions.md'
-  - 'Functions for working with external dictionaries': 'functions/ext_dict_functions.md'
+  - 'Functions for working with strings': 'functions/string_functions.md'
+  - 'Functions for searching strings': 'functions/string_search_functions.md'
+  - 'Functions for searching and replacing in strings': 'functions/string_replace_functions.md'
+  - 'Conditional functions': 'functions/conditional_functions.md'
+  - 'Mathematical functions': 'functions/math_functions.md'
+  - 'Rounding functions': 'functions/rounding_functions.md'
+  - 'Functions for working with arrays': 'functions/array_functions.md'
+  - 'Functions for splitting and merging strings and arrays': 'functions/splitting_merging_functions.md'
+  - 'Bit functions': 'functions/bit_functions.md'
   - 'Hash functions': 'functions/hash_functions.md'
-  - 'Higher-order functions': 'functions/higher_order_functions.md'
-  - 'Functions for implementing the IN operator': 'functions/in_functions.md'
+  - 'Functions for generating pseudo-random numbers': 'functions/random_functions.md'
+  - 'Encoding functions': 'functions/encoding_functions.md'
+  - 'Functions for working with URLs': 'functions/url_functions.md'
   - 'Functions for working with IP addresses': 'functions/ip_address_functions.md'
   - 'Functions for working with JSON.': 'functions/json_functions.md'
-  - 'Logical functions': 'functions/logical_functions.md'
-  - 'Mathematical functions': 'functions/math_functions.md'
+  - 'Higher-order functions': 'functions/higher_order_functions.md'
   - 'Other functions': 'functions/other_functions.md'
-  - 'Functions for generating pseudo-random numbers': 'functions/random_functions.md'
-  - 'Rounding functions': 'functions/rounding_functions.md'
-  - 'Functions for splitting and merging strings and arrays': 'functions/splitting_merging_functions.md'
-  - 'Functions for working with strings': 'functions/string_functions.md'
-  - 'Functions for searching and replacing in strings': 'functions/string_replace_functions.md'
-  - 'Functions for searching strings': 'functions/string_search_functions.md'
-  - 'Type conversion functions': 'functions/type_conversion_functions.md'
-  - 'Functions for working with URLs': 'functions/url_functions.md'
+  - 'Functions for working with external dictionaries': 'functions/ext_dict_functions.md'
   - 'Functions for working with Yandex.Metrica dictionaries': 'functions/ym_dict_functions.md'
+  - 'Functions for implementing the IN operator': 'functions/in_functions.md'
+  - 'arrayJoin function': 'functions/array_join.md'
 
 - 'Aggregate functions':
   - 'Introduction': 'agg_functions/index.md'