Fixed flicker and added a spinner.