Changed location of jquery to outside body
updated with slider
fixed navbar post-failed merge