removed nav-link-current
merged changes