Massive structure change

Huge changes to page construction, looks the same in the end result.
fixes #11 bust causes another...