move logo into top navbar

Move the logo into the top navbar