less cruft, correctly positioned spinner