update layout.
update test cases.