Resoved conflicts in index and made serving simpler

This commit resolves some conflicts in index-new.html that were causing
it to display weirdly and resolves serving files across browsers.