Fix some problem in spinner