css and js loading improvements