Navigation Bar changes/Other changes & fixes