Final fix for css and scripts issue