bit of styling
css
fixed conflicts
trying to fix css