spinner & flow improvements