Fixed spinner issue. Cleaned up details