Added spinners and dark theme