FIX: Use proper HTML for spinner rather than handlebars