Clean up toggle buttons