Tidied up post templates
Amended base template