first minor stylings and including some jade templates