Issue #316 CSS fixes