fix layout, update beginning