Feature/navigation

Navigation bar tooltip fixes