moved more css to the stylesheet
merge n stuff