diff --git a/architecture/trusted_applications.rst b/architecture/trusted_applications.rst
index 1872875..3929bba 100644
--- a/architecture/trusted_applications.rst
+++ b/architecture/trusted_applications.rst
@@ -106,13 +106,13 @@
 This section give a more in depth description of the TA properties (see
 :ref:`build_trusted_applications` also).
 
-1. GlobalPlatform properties
-============================
+GlobalPlatform Properties
+=========================
 Standard TA properties must be defined through property flag in macro
 ``TA_FLAGS`` in ``user_ta_header_defines.h``
 
-1.1 Single Instance
-===================
+Single Instance
+---------------
 ``"gpd.ta.singleInstance"`` is a boolean property of the TA. This property
 defines if one instance of the TA must be created and will receive all open
 session request, or if a new specific TA instance must be created for each
@@ -121,8 +121,8 @@
 ``TA_FLAGS`` sets bit ``TA_FLAG_SINGLE_INSTANCE``, otherwise the boolean
 property is set to ``false``.
 
-1.2 Multi-session
-=================
+Multi-session
+-------------
 ``"gpd.ta.multiSession"`` is a boolean property of the TA. This property defines
 if the TA instance can handle several sessions. If disabled, TA instance support
 only one session. In such case, if the TA already has a opened session, any open
@@ -136,8 +136,8 @@
 The boolean property is set to ``true`` if ``TA_FLAGS`` sets bit
 ``TA_FLAG_MULTI_SESSION``, otherwise the boolean property is set to ``false``.
 
-1.3 Keep Alive
-==============
+Keep Alive
+----------
 ``"gpd.ta.instanceKeepAlive"`` is a boolean property of the TA. This property
 defines if the TA instance created must be destroyed or not when all sessions
 opened towards the TA are closed. If the property is enabled, TA instance, once
@@ -153,26 +153,26 @@
 ``TA_FLAG_INSTANCE_KEEP_ALIVE``, otherwise the boolean property is set to
 ``false``.
 
-1.4 Heap Size
-=============
+Heap Size
+---------
 ``"gpd.ta.dataSize"`` is a 32bit integer property of the TA. This property
 defines the size in bytes of the TA allocation pool, in which ``TEE_Malloc()``
 and friends allocate memory. The value of the property must be defined by the
 macro ``TA_DATA_SIZE`` in ``user_ta_header_defines.h`` (see
 :ref:`build_ta_properties`).
 
-1.5 Stack Size
-==============
+Stack Size
+----------
 ``"gpd.ta.stackSize"`` is a 32bit integer property of the TA. This property
 defines the size in bytes of the stack used for TA execution. The value of the
 property must be defined by the macro ``TA_STACK_SIZE`` in
 ``user_ta_header_defines.h`` (see :ref:`build_ta_properties`).
 
-2. Property extensions
-======================
+Property Extensions
+===================
 
-2.1 Secure Data Path Flag
-=========================
+Secure Data Path Flag
+---------------------
 ``TA_FLAG_SECURE_DATA_PATH`` is a bit flag supported by ``TA_FLAGS``. This
 property flag claims the secure data support from the OP-TEE OS for the TA.
 Refer to the OP-TEE OS for secure data path support. TAs that do not set
@@ -180,20 +180,21 @@
 to handle memory reference invocation parameters that relate to secure data path
 buffers.
 
-2.2 Cache maintenance Flag
-==========================
+
+Cache maintenance Flag
+----------------------
 ``TA_FLAG_CACHE_MAINTENANCE`` is a bit flag supported by ``TA_FLAGS``. This
 property flag claims access to the cache maintenance API for the TA:
 ``TEE_CacheXxxx()``. Refer to the OP-TEE to check if cache API support is
 enabled. TAs that do not set ``TA_FLAG_CACHE_MAINTENANCE`` in the value of their
 ``TA_FLAGS`` will not be able to call the cache maintenance API.
 
-.. _ELF: https://en.wikipedia.org/wiki/Executable_and_Linkable_Format
-.. _early TA commit: https://github.com/OP-TEE/optee_os/commit/d0c636148b3a
 
-2.3 Deprecated Property Flags
-=============================
-
+Deprecated Property Flags
+-------------------------
 Older versions of OP-TEE used to define extended property flags that are
 deprecated and meaningless to current OP-TEE. These are ``TA_FLAG_USER_MODE``,
 ``TA_FLAG_EXEC_DDR`` and ``TA_FLAG_REMAP_SUPPORT``.
+
+.. _ELF: https://en.wikipedia.org/wiki/Executable_and_Linkable_Format
+.. _early TA commit: https://github.com/OP-TEE/optee_os/commit/d0c636148b3a