Partial styles in place, basic structure
Fixed Merge conflicts