Bug 1685041: Getting new templates to save layout

A regression problem created when trying to fix existing layouts
in Bug 1672737

Also getting site template heading link in panel go to the edit screen
as that is the only logical place for it to go

behatnotneeded

Change-Id: Id6de8a9430bfecc23a6cdb573102fbeac7a6cd42
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>