Merge "Apply new code formatting to navigationbar" into main