updated badges and navbar, changed up navbar logo block to contain more of the overrideable tags