revert layout changes in commit 10465080dd805501d5ac1c479983e9a29f3dfee5.