Navigator UI refresh

by Matt Pearce