Slightly improve when regex is compiled
Add spinner plus other changes