Updated - Spinner to be transparent
Simplify
Merge branch 'goldbattle-master'