DEVELOPER-1006 remove duplicate layout
DEVELOPER-1147 Apply freemodeler banner style
Merge pull request #698 from paulrobinson/DEVELOPER-1006

Developer 1006