Fix progress bar display when percentage < 3 BOOK-839

And format the component template for easier review.
This also includes BOOK-846