fix layout,found soem bugs