further templatization.  add css-animate.  some rearranging.