Re-ordering CSS imports to fix bugs