update layout and comments