fixing menu opt
fixing menu behavior
menu optr
opt
opt
opt
opt
options menu
options menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.html
test