Tried customising node.tpl.php

Also more refactoring.