Fix namespacing; headers and titles
And more