some stuff
fixed conflicts
revised content-module in css
fixed conflicts