am 5cd1d92f: Fixing several layout issues.

* commit '5cd1d92f6c40b47eff12859d4e13b6431aa778c0':
  Fixing several layout issues.