Removed footer placeholder text
Fixed loc-list style regression
Spacing tweaks for header elements
merge conflict resolution
removed artifact from merge conflict