Feature/mah navbar