Update layout
Update layout and wording