Shortened OPD template article ID
Merge in code review changes; remove whitespace on single-degree.php