Options buttons now properly work