Navigation bar and Layout Updates