Cleaned up arrow toggle