place some elements side by side to regain a line

Change-Id: I9b838b6c00bc6e456adcf5d63c9936c08bf0d1aa
(cherry picked from commit 5eaa0135c3ffc46ce601ea4cbaaa17eabe44e6ee)