New (not working) article template, plus tweaks.