fix code
fix status bar