Merge, added options menu.

Added the options menu.