finished v2-to-v3 migration + navbar fixes