Incoporating changes from index-fluid.html (correcting some errors with
js?)