Feature/spinner