add comment and layout update