Merge conflicts, CSS changes

I don't remember what all in this is new because I have been resolving merge conflicts for what feels like forever now.