case 2883 - Adding missing headers, removing spaces and changing js load.