added quotes page
fixed navbar
merging