Additional Merge Fixes

Linking main html to the right js and cc documents