Revise the layout and form
Update layout