feedback and removed useless stylesheet
merge