refactored existing jade using 'includes' partials