Templating fixes

ok - putting this on the right repo.

@bikeath1337 - you said actions we're missing? i'm not sure which actions weren't visible but everything appears right to me locally: let's sit down and see what's up?