Code review:then I made some corrections in layout.