some modify in layout and correct tiny errors