Revert some bad style choices and restructure content a bit!