I42: Update navbar

Reviewed and approved. Please, merge into master.