Spinner now working

Layout fixes