updated
fixed navbar
merging