add menu & solve some bugs