Removed excess linebreak and spaces.
Added a new base template - still needs to be applied to all child templates.