Added better css and js bundling