Added jquery-ui
Updated fade in length and nav bar transition
fixed small merge conflict