Fix option delete, update controls