Working on option menu
fixing merging conflicts
Cleaned up options menu code