more css changes
resolved conflicts