Those last little CSS tidbits
fix merge conflict