improve naming and get spinner working correctly