finished CSS-ing stuff
resolved conflicts