Added some spinners etc.