Fix template syntax
Update HTML comments and homepage margins

Signed-off-by: Thomas Sturge <tomsturge@googlemail.com>