Moved Single Header to Partial

And cleaned up some odds and ends.