CSS fix and additions