optic fixes!
Spinner added!