improve styles fix bugs