Reworking navbar and avatar into there own partials