fix bugs
fix more button [WIP]