Fixed options menu bugs; changed algorithm