Removed references to navbar for real this time.