Fix alignment and mismatched mustache tags