Added Spinner, still buggy