bugfix for missing line breaks & model name

Added bugfix for missing line breaks and unprefixed model name in cms generator :beetle: 

@iphilgood