change layout
add some delete function
fix some bug