Fixed bugs and deleted spinner

😦...