Spinner is working but not that perfect