update layout and comments
update layout and comments