Step two with proper layouting.