CSS Fixes for #1089