Update layout and add Pedro