Merging my merge and changes from some css fixes.