template ugprades
styling tweaks
use correct base template
content updates to suit templates