Merged in Navigation, Images, Updated CSS, and Scripts