added back logo into navbar
fixed settings drop down to include links in navbar
grammar nazi coming at you again