Further Fixes in CSS Import Structure