Some more CSS related fixes.