fixed up jade templates and using extend and block template inheritance