fix some bugs, add options menu