fix bug, change layout.