update layout, add more comments