Fix layout

Change-Id: I9ed7a9fbb282febac66d79c6f0796506045448c8