Beta 7: navbar update