Fixes #5538: Add new top navbar