fix layout bug
add history