Added spinner instead of toggle