Tweaks, plus spinner animation