CSS clearfix and minor tweaks. #1684