moved more css around, and some markup too