added stylesheet
fixed conflicts