Put more layout in place