am c8cdf49a: am 1c2c2b65: am 4b943553: Fixes some entry layouts

* commit 'c8cdf49ac607684b8113cae86a225d27c6ae2189':
  Fixes some entry layouts