Few bugs resolved regarding Option Menu issues