Minor UI refactoring, remove spinner.