[Olena-patches] [PATCH 31/32] Aesthetic changes.