Changed bootstrap location, made changes to navbar