Fixes #5538: Add new top navbar
Fixes #5554: Improve Directive Page !