more css, post-merge fixup