Navigator style fixes