updated to latest jade and adjusted templates