Recapitalise whole website
Rework spinner so it is less buggy