am 4b943553: Fixes some entry layouts

* commit '4b943553afdb7286b33e4bc2481431e816c57967':
  Fixes some entry layouts