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

* commit '1c2c2b654f778ddbb7dd301046ab6fbc638846cc':
  Fixes some entry layouts