Final tweaks.
Fix the backward compatibility with previous layout.
Merge branch 'talk-sotr'

* talk-sotr:
  Fix the backward compatibility with previous layout.
  Final tweaks.