Removed unnecessary markup
Spacing on global template