Update mustache template for a more flexible form :barber: