Reorder html to ensure spinner works; use compressed assets for prod.
Merge latest from dev.