remove the toolbar & fix the bug
add more support for