Fixed merge conflicts and added new navbar & slider, removed scripts and tweaked things