Add 'NavigationBar : Customization' again

Also adds 'Properly null check all button usages.' from cm.