Update layout and comments